02 Mar 2013

This commit is contained in:
g-cont 2013-03-02 00:00:00 +04:00 committed by Alibek Omarov
parent 8b4db8dd87
commit 503f6c58e7
7 changed files with 31 additions and 21 deletions

View File

@ -1,3 +1,20 @@
build 2113
Engine: added option "nomodels" for liblist.gam (disallow user to choose playermodel)
Client: a new callback for render interface who called R_DrawCubemapView. This fixes cmd "envshot" for XashXT
Client: store screenshots into root of folder "scrshots" instead of "scrshots\mapname"
Client: engine using callback CL_CameraOffset now
Client: fix angles for cmd "envshot"
Render: rename a miss cvar "r_anisotropy" to real name "gl_anisotropy"
Render: now "r_speeds 4" displays an actual count of "real" static entities that was created by call of MAKE_STATIC function
Render: fix bug with blinking Quake Sky while autosave in progress
Render: keep actual hardware gamma for multiple instances of application
Engine: get support for Half-Life alpha maps (that has version 29)
Engine: kill the whitespaces in the modelpath (Zion Warcry issues)
Server: fix the client rejection mechanism
Server: using the pfnClientDisconnect callback
Server: some changes in physics code (for MOVETYPE_PUSH)
build 2153
Render: added cvar "gl_nosort" that disables sorting of translucent surfaces

View File

@ -16,6 +16,8 @@ GNU General Public License for more details.
#ifndef GAMEINFO_H
#define GAMEINFO_H
#define GFL_NOMODELS (1<<0)
/*
========================================================================
@ -31,7 +33,8 @@ typedef struct
char startmap[64]; // map to start singleplayer game
char trainmap[64]; // map to start hazard course (if specified)
char title[64]; // Game Main Title
char version[16]; // game version (optional)
char version[14]; // game version (optional)
short flags; // game flags
// about mod info
char game_url[256]; // link to a developer's site
@ -41,9 +44,6 @@ typedef struct
char size[64]; // displayed mod size
int gamemode;
int nomodels; // can't select playermodel
int reserved[8]; // for potential expansions with backward compatibility
} GAMEINFO;
#endif//GAMEINFO_H

View File

@ -233,7 +233,9 @@ static void UI_ConvertGameInfo( GAMEINFO *out, gameinfo_t *in )
Q_strncpy( out->date, in->date, sizeof( out->date ));
out->gamemode = in->gamemode;
out->nomodels = in->nomodels;
if( in->nomodels )
out->flags |= GFL_NOMODELS;
}
static qboolean PIC_Scissor( float *x, float *y, float *width, float *height, float *u0, float *v0, float *u1, float *v1 )

View File

@ -414,11 +414,8 @@ qboolean R_AddEntity( struct cl_entity_s *clent, int entityType )
if( clent->curstate.effects & EF_NODRAW )
return false; // done
if( clent->curstate.rendermode != kRenderNormal && clent->curstate.rendermode != kRenderTransAlpha )
{
if( clent->curstate.renderamt <= 0.0f )
return true; // invisible
}
if( clent->curstate.rendermode != kRenderNormal && clent->curstate.renderamt <= 0.0f )
return true; // invisible
clent->curstate.entityType = entityType;

View File

@ -1067,7 +1067,8 @@ static edict_t *SV_PushRotate( edict_t *pusher, float movetime )
if( check->v.movetype != MOVETYPE_WALK )
{
if( lmove[2] != 0.0f ) check->v.flags &= ~FL_ONGROUND;
if( lmove[2] < 0.0f ) lmove[2] = 0.0f; // let's the free falling
if( lmove[2] < 0.0f && !pusher->v.dmg )
lmove[2] = 0.0f; // let's the free falling
}
// try moving the contacted entity

View File

@ -147,7 +147,7 @@ static void UI_PlayerSetup_GetConfig( void )
}
}
if( gMenu.m_gameinfo.nomodels )
if( gMenu.m_gameinfo.flags & GFL_NOMODELS )
uiPlayerSetup.model.curValue = 0.0f; // force to default
strcpy( uiPlayerSetup.currentModel, uiPlayerSetup.models[(int)uiPlayerSetup.model.curValue] );
@ -346,7 +346,7 @@ static void UI_PlayerSetup_Init( void )
if( !stricmp( gMenu.m_gameinfo.gamefolder, "hlrally" ))
game_hlRally = TRUE;
if( gMenu.m_gameinfo.nomodels )
if( gMenu.m_gameinfo.flags & GFL_NOMODELS )
addFlags |= QMF_INACTIVE;
uiPlayerSetup.menu.vidInitFunc = UI_PlayerSetup_Init;
@ -479,7 +479,7 @@ static void UI_PlayerSetup_Init( void )
UI_AddItem( &uiPlayerSetup.menu, (void *)&uiPlayerSetup.view );
UI_AddItem( &uiPlayerSetup.menu, (void *)&uiPlayerSetup.name );
if( !gMenu.m_gameinfo.nomodels )
if( !gMenu.m_gameinfo.flags & GFL_NOMODELS )
{
UI_AddItem( &uiPlayerSetup.menu, (void *)&uiPlayerSetup.model );
UI_AddItem( &uiPlayerSetup.menu, (void *)&uiPlayerSetup.topColor );

View File

@ -63,12 +63,5 @@ int GetMenuAPI( UI_FUNCTIONS *pFunctionTable, ui_enginefuncs_t* pEngfuncsFromEng
gpGlobals = pGlobals;
if( (int)CVAR_GET_FLOAT( "build" ) < 2213 )
{
Con_Printf( "^1Error:^7 using too old engine version. menu.dll will not loaded.\n" );
Con_Printf( "^1Error:^7 you need at least engine build 2213 or above.\n" );
return FALSE;
}
return TRUE;
}