diff options
author | /dev/humancontroller <devhc@example.com> | 2014-07-13 16:52:36 +0200 |
---|---|---|
committer | /dev/humancontroller <devhc@example.com> | 2017-03-09 13:51:10 +0100 |
commit | 2f121b29cfb9eeb0674b40021b730ed3d2b67709 (patch) | |
tree | 8fe5d675fba42ff69d334e40d1eb61720fc9ba24 /src/cgame | |
parent | c449b6c1721a9fa43f4f9457568c239cc7f5105a (diff) |
refactor stuff
Diffstat (limited to 'src/cgame')
-rw-r--r-- | src/cgame/cg_local.h | 2 | ||||
-rw-r--r-- | src/cgame/cg_players.c | 8 | ||||
-rw-r--r-- | src/cgame/cg_servercmds.c | 6 | ||||
-rw-r--r-- | src/cgame/cg_view.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 54477662..e759eaba 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -2083,6 +2083,6 @@ typedef enum DT_INTERACTIVE, // team, class, armoury DT_ARMOURYEVOLVE, // Insufficient funds et al DT_BUILD, // build errors - DT_COMMAND, // You must be living/human/spec etc. + DT_COMMAND, // You must be alive/human/spec/etc. } dialogType_t; diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c index 5556bd5c..c882dd37 100644 --- a/src/cgame/cg_players.c +++ b/src/cgame/cg_players.c @@ -619,7 +619,7 @@ static int CG_GetCorpseNum( class_t class ) if( !Q_stricmp( modelName, match->modelName ) && !Q_stricmp( skinName, match->skinName ) ) { - // this clientinfo is identical, so use it's handles + // this clientinfo is identical, so use its handles return i; } } @@ -2160,7 +2160,7 @@ void CG_Corpse( centity_t *cent ) int renderfx; qboolean shadow = qfalse; float shadowPlane; - vec3_t origin, liveZ, deadZ; + vec3_t origin, aliveZ, deadZ; float scale; corpseNum = CG_GetCorpseNum( es->clientNum ); @@ -2180,8 +2180,8 @@ void CG_Corpse( centity_t *cent ) memset( &head, 0, sizeof( head ) ); VectorCopy( cent->lerpOrigin, origin ); - BG_ClassBoundingBox( es->clientNum, liveZ, NULL, NULL, deadZ, NULL ); - origin[ 2 ] -= ( liveZ[ 2 ] - deadZ[ 2 ] ); + BG_ClassBoundingBox( es->clientNum, aliveZ, NULL, NULL, deadZ, NULL ); + origin[ 2 ] -= ( aliveZ[ 2 ] - deadZ[ 2 ] ); VectorCopy( es->angles, cent->lerpAngles ); diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c index ab071d42..5e2c20da 100644 --- a/src/cgame/cg_servercmds.c +++ b/src/cgame/cg_servercmds.c @@ -562,9 +562,9 @@ void CG_Menu( int menu, int arg ) type = DT_COMMAND; break; - case MN_CMD_LIVING: - //longMsg = "You must be living to perform this action."; - shortMsg = "Must be living to use this command"; + case MN_CMD_ALIVE: + //longMsg = "You must be alive to perform this action."; + shortMsg = "Must be alive to use this command"; type = DT_COMMAND; break; diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c index f7f42474..1259fbb8 100644 --- a/src/cgame/cg_view.c +++ b/src/cgame/cg_view.c @@ -181,7 +181,7 @@ static void CG_AddTestModel( void ) return; } - // if testing a gun, set the origin reletive to the view origin + // if testing a gun, set the origin relative to the view origin if( cg.testGun ) { VectorCopy( cg.refdef.vieworg, cg.testModelEntity.origin ); @@ -1303,7 +1303,7 @@ static int CG_CalcViewValues( void ) CG_OffsetFirstPersonView( ); } - // position eye reletive to origin + // position eye relative to origin AnglesToAxis( cg.refdefViewAngles, cg.refdef.viewaxis ); if( cg.hyperspace ) |