diff options
| -rw-r--r-- | src/cgame/cg_draw.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_view.c | 2 | ||||
| -rw-r--r-- | src/game/bg_misc.c | 12 | ||||
| -rw-r--r-- | src/game/bg_public.h | 4 | ||||
| -rw-r--r-- | src/game/g_client.c | 4 | ||||
| -rw-r--r-- | src/game/tremulous.h | 6 |
6 files changed, 18 insertions, 14 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index cb37b8ac..500beb00 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -2190,8 +2190,6 @@ static void CG_Draw2D( void ) //TA: draw the lighting effects e.g. nvg CG_DrawLighting( ); - if( cg.predictedPlayerState.stats[ STAT_PTEAM ] != PTE_NONE ) - menu = Menus_FindByName( BG_FindHudNameForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ] ) ); defaultMenu = Menus_FindByName( "default_hud" ); @@ -2200,6 +2198,8 @@ static void CG_Draw2D( void ) w = CG_Text_Width( SPECTATOR_STRING, 0.7f, 0 ); CG_Text_Paint( 320 - w / 2, 440, 0.7f, color, SPECTATOR_STRING, 0, 0, ITEM_TEXTSTYLE_SHADOWED ); } + else + menu = Menus_FindByName( BG_FindHudNameForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ] ) ); if( !( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) && !( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) && menu ) diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c index 89f25029..3e56c91d 100644 --- a/src/cgame/cg_view.c +++ b/src/cgame/cg_view.c @@ -1079,7 +1079,7 @@ static void CG_smoothWWTransitions( playerState_t *ps, const vec3_t in, vec3_t o } //iterate through ops - for( i = 0; i < MAXSMOOTHS; i++ ) + for( i = MAXSMOOTHS - 1; i >= 0; i-- ) { //if this op has time remaining, perform it if( cg.time < cg.sList[ i ].time + cg_wwSmoothTime.integer ) diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 3dfbaae8..04328d71 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -3152,12 +3152,12 @@ upgradeAttributes_t bg_upgrades[ ] = WUT_HUMANS //WUTeam_t team; }, { - UP_100CGAMMO, //int upgradeNum; + UP_CGAMMO, //int upgradeNum; CGAMMO_PRICE, //int price; ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages SLOT_NONE, //int slots; - "100cgammo", //char *upgradeName; - "100 Chaingun bullets", //char *upgradeHumanName; + "cgammo", //char *upgradeName; + "Chaingun bullets", //char *upgradeHumanName; "icons/iconw_gauntlet", WP_CHAINGUN, //weapon_t weaponAmmo; 100, //int ammo; @@ -3165,12 +3165,12 @@ upgradeAttributes_t bg_upgrades[ ] = WUT_HUMANS //WUTeam_t team; }, { - UP_200GAS, //int upgradeNum; + UP_GAS, //int upgradeNum; GAS_PRICE, //int price; ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages SLOT_NONE, //int slots; - "200gas", //char *upgradeName; - "200 Flamer gas", //char *upgradeHumanName; + "gas", //char *upgradeName; + "Flamer gas", //char *upgradeHumanName; "icons/iconw_gauntlet", WP_FLAMER, //weapon_t weaponAmmo; 200, //int ammo; diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 76115f18..5c32a435 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -353,8 +353,8 @@ typedef enum UP_BATTLESUIT, UP_MGCLIP, - UP_100CGAMMO, - UP_200GAS, + UP_CGAMMO, + UP_GAS, UP_NUM_UPGRADES } upgrade_t; diff --git a/src/game/g_client.c b/src/game/g_client.c index af242be3..0935c84a 100644 --- a/src/game/g_client.c +++ b/src/game/g_client.c @@ -1405,6 +1405,10 @@ void ClientSpawn( gentity_t *ent, gentity_t *spawn ) // health will count down towards max_health ent->health = client->ps.stats[ STAT_HEALTH ] = client->ps.stats[ STAT_MAX_HEALTH ]; //* 1.25; + //clear the credits array + for( i = 0; i < MAX_CLIENTS; i++ ) + ent->credits[ i ] = 0; + G_SetOrigin( ent, spawn_origin ); VectorCopy( spawn_origin, client->ps.origin ); diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 74d0b1ce..6e7893db 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -365,11 +365,11 @@ #define BSUIT_PRICE 200 -#define MGCLIP_PRICE 10 +#define MGCLIP_PRICE 0 -#define CGAMMO_PRICE 10 +#define CGAMMO_PRICE 0 -#define GAS_PRICE 10 +#define GAS_PRICE 0 |