diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c index 688aa122..0cc52925 100644 --- a/reaction/cgame/cg_main.c +++ b/reaction/cgame/cg_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.92 2002/07/01 02:18:41 jbravo +// Small fixes to CTB and possible fix for subs and limchasecam +// // Revision 1.91 2002/06/30 17:33:01 jbravo // New radio sounds and the 0wned sound was added. // @@ -1376,12 +1379,18 @@ static void CG_RegisterGraphics(void) // cgs.media.blueFlagModel = trap_R_RegisterModel("models/flags/b_flag.md3"); cgs.media.redFlagModel = trap_R_RegisterModel("models/cases/s_case.md3"); cgs.media.blueFlagModel = trap_R_RegisterModel("models/cases/b_case.md3"); - cgs.media.redFlagShader[0] = trap_R_RegisterShaderNoMip("icons/iconf_red1"); + cgs.media.redFlagShader[0] = trap_R_RegisterShaderNoMip("icons/iconc_silver1"); + cgs.media.redFlagShader[1] = trap_R_RegisterShaderNoMip("icons/iconc_silver2"); + cgs.media.redFlagShader[2] = trap_R_RegisterShaderNoMip("icons/iconc_silver3"); + cgs.media.blueFlagShader[0] = trap_R_RegisterShaderNoMip("icons/iconc_black1"); + cgs.media.blueFlagShader[1] = trap_R_RegisterShaderNoMip("icons/iconc_black2"); + cgs.media.blueFlagShader[2] = trap_R_RegisterShaderNoMip("icons/iconc_black3"); +/* cgs.media.redFlagShader[0] = trap_R_RegisterShaderNoMip("icons/iconf_red1"); cgs.media.redFlagShader[1] = trap_R_RegisterShaderNoMip("icons/iconf_red2"); cgs.media.redFlagShader[2] = trap_R_RegisterShaderNoMip("icons/iconf_red3"); cgs.media.blueFlagShader[0] = trap_R_RegisterShaderNoMip("icons/iconf_blu1"); cgs.media.blueFlagShader[1] = trap_R_RegisterShaderNoMip("icons/iconf_blu2"); - cgs.media.blueFlagShader[2] = trap_R_RegisterShaderNoMip("icons/iconf_blu3"); + cgs.media.blueFlagShader[2] = trap_R_RegisterShaderNoMip("icons/iconf_blu3"); */ } // JBravo: moved outof MISSIONPACK cgs.media.dustPuffShader = trap_R_RegisterShader("hasteSmokePuff"); diff --git a/reaction/game/bg_misc.c b/reaction/game/bg_misc.c index 5a378019..aae02ab5 100644 --- a/reaction/game/bg_misc.c +++ b/reaction/game/bg_misc.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.43 2002/07/01 02:18:42 jbravo +// Small fixes to CTB and possible fix for subs and limchasecam +// // Revision 1.42 2002/06/29 04:15:15 jbravo // CTF is now CTB. no weapons while the case is in hand other than pistol or knife // @@ -538,8 +541,8 @@ Only in CTF games {"models/cases/s_case.md3", 0, 0, 0} , -/* icon */ "icons/iconf_red1", -/* pickup */ "Red Flag", +/* icon */ "icons/iconc_silver", +/* pickup */ "Silver Case", 0, IT_TEAM, PW_REDFLAG, @@ -558,8 +561,8 @@ Only in CTF games {"models/cases/b_case.md3", 0, 0, 0} , -/* icon */ "icons/iconf_blu1", -/* pickup */ "Blue Flag", +/* icon */ "icons/iconc_black", +/* pickup */ "Black Case", 0, IT_TEAM, PW_BLUEFLAG, diff --git a/reaction/game/g_teamplay.c b/reaction/game/g_teamplay.c index 7a1171dc..5f0c11b0 100644 --- a/reaction/game/g_teamplay.c +++ b/reaction/game/g_teamplay.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.117 2002/07/01 02:18:42 jbravo +// Small fixes to CTB and possible fix for subs and limchasecam +// // Revision 1.116 2002/06/29 04:15:15 jbravo // CTF is now CTB. no weapons while the case is in hand other than pistol or knife // @@ -922,6 +925,16 @@ void SpawnPlayers() ClientUserinfoChanged(clientNum); client->sess.teamSpawn = qfalse; } +// JBravo: lets make those pesky subs follow live players. + if (g_RQ3_limchasecam.integer != 0 && g_RQ3_matchmode.integer) { + for (i = 0; i < level.maxclients; i++) { + player = &g_entities[i]; + if (!player->inuse || !player->client) + continue; + if (player->client->sess.sub != TEAM_FREE) + Cmd_FollowCycle_f(player, 1); + } + } //Blaze: May aswell respawn breakables here for (i = 0; i < level.num_entities; i++) { ent = &g_entities[i];