FWGS
/
Xash3DArchive
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

14 Jan 2009

This commit is contained in:
g-cont 2009-01-14 00:00:00 +03:00 committed by Alibek Omarov
parent 9bea4a32a3
commit d1a148b3d2
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debug.bat
View File

@ -72,5 +72,5 @@ if exist xtools\xtools.plg del /f /q xtools\xtools.plg
echo Build succeeded!
echo Please wait. Xash is now loading
cd D:\Xash3D\
quake.exe -game tmpQuArK -log -debug -dev 3 +map qctest
quake.exe -game tmpQuArK -log -debug -dev 3 +map dm_knot
:done

12
engine/server/sv_phys.c
View File

@ -326,7 +326,7 @@ bool SV_RunThink( edict_t *ent )
if( ent->v.nextthink <= 0 || ent->v.nextthink > sv.time + svgame.globals->frametime )
return true;
for( iterations = 0; iterations < 128 && !ent->free; iterations++ )
for( iterations = 0; iterations < 128 && !ent->v.flags & FL_KILLME; iterations++ )
{
svgame.globals->time = max( sv.time, ent->v.nextthink );
ent->v.nextthink = 0;
@ -1533,7 +1533,7 @@ A moving object that doesn't obey physics
void SV_Physics_Noclip( edict_t *ent )
{
// regular thinking
if(SV_RunThink( ent ))
if( SV_RunThink( ent ))
{
SV_CheckWater( ent );
VectorMA( ent->v.angles, svgame.globals->frametime, ent->v.avelocity, ent->v.angles );
@ -1552,8 +1552,8 @@ Non moving objects can only think
*/
void SV_Physics_None( edict_t *ent )
{
if (ent->v.nextthink > 0 && ent->v.nextthink <= sv.time + svgame.globals->frametime)
SV_RunThink (ent);
if( ent->v.nextthink > 0 && ent->v.nextthink <= sv.time + svgame.globals->frametime )
SV_RunThink( ent );
}
@ -1592,7 +1592,7 @@ static void SV_Physics_Entity( edict_t *ent )
case MOVETYPE_TOSS:
case MOVETYPE_BOUNCE:
case MOVETYPE_FLY:
if(SV_RunThink( ent )) SV_Physics_Toss( ent );
if( SV_RunThink( ent )) SV_Physics_Toss( ent );
break;
case MOVETYPE_CONVEYOR:
SV_Physics_Conveyor( ent );
@ -1629,7 +1629,7 @@ void SV_Physics_ClientEntity( edict_t *ent )
svgame.dllFuncs.pfnPlayerPreThink( ent );
SV_CheckVelocity( ent );
switch((int)ent->v.movetype )
switch( ent->v.movetype )
{
case MOVETYPE_PUSH:
SV_Physics_Pusher( ent );

8
launch/console.c
View File

@ -15,9 +15,9 @@ WIN32 CONSOLE
===============================================================================
*/
//console defines
// console defines
#define SUBMIT_ID 1 // "submit" button
#define QUIT_ON_ESCPE_ID 2 // escape event
#define QUIT_ON_ESCAPE_ID 2 // escape event
#define EDIT_ID 110
#define INPUT_ID 109
#define IDI_ICON1 101
@ -118,7 +118,7 @@ static long _stdcall Con_WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
case WM_HOTKEY:
switch(LOWORD(wParam))
{
case QUIT_ON_ESCPE_ID:
case QUIT_ON_ESCAPE_ID:
PostQuitMessage( 0 );
break;
}
@ -408,7 +408,7 @@ void Con_RegisterHotkeys( void )
SetFocus( s_wcd.hWnd );
// user can hit escape for quit
RegisterHotKey(s_wcd.hWnd, QUIT_ON_ESCPE_ID, 0, VK_ESCAPE );
RegisterHotKey( s_wcd.hWnd, QUIT_ON_ESCAPE_ID, 0, VK_ESCAPE );
}
/*

2
launch/system.c
View File

@ -585,7 +585,7 @@ void Sys_Print( const char *pMsg )
Sys_PrintLog( logbuf );
// don't flood system console with memory allocation messages or another
if( Sys.Con_Print && Sys.printlevel < D_LOAD )
if( Sys.Con_Print && Sys.printlevel < D_MEMORY )
Sys.Con_Print( buffer );
Sys.printlevel = 0; // reset before next message
}

9
server/ents/basefunc.cpp
View File

@ -792,11 +792,18 @@ LINK_ENTITY_TO_CLASS( func_rotating, CFuncRotating );
void CFuncRotating :: KeyValue( KeyValueData* pkvd)
{
if (FStrEq(pkvd->szKeyName, "spintime"))
if( FStrEq( pkvd->szKeyName, "spintime" ))
{
pev->frags = atof(pkvd->szValue);
pkvd->fHandled = TRUE;
}
if( FStrEq( pkvd->szKeyName, "spawnorigin" ))
{
Vector tmp;
UTIL_StringToVector( tmp, pkvd->szValue );
if( tmp != g_vecZero ) pev->origin = tmp;
pkvd->fHandled = TRUE;
}
else CBaseBrush::KeyValue( pkvd );
}