rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-10 23:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed team none in DM and some final cleanups for the 3.0 release

Browse source
This commit is contained in:
Richard Allen 2003-04-09 02:00:43 +00:00
parent e7bc378953
commit c5fecc7474
6 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reaction/ChangeLog
View file

@ -1,5 +1,6 @@
# List fixes here for the 3.0 release
* It is now possible to soectate in DM.
* Added cg_RQ3_zcam_stfu to stop zcam printing who its following or tracking.
* Fixed bug where dropping the bandolier would not reduce amount of ammo
* Its now impossible to change nicks to avoide votekicks.
@ -22,7 +23,7 @@
* Added Itembanning
* Fixed a bug in weaponbanning
* Fixed bugs screaming about teamkills in TDM and CTB
* Fixed a bug where all items could be dropped.
* Fixed a bug where all items could be dropped at once.
* Tweaked helmet control.
* Fixed a bug that forced players into follow mode spec after death.
* Lots of TDM fixes.

5
reaction/cgame/cg_consolecmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.55 2003/04/09 02:00:43 jbravo
// Fixed team none in DM and some final cleanups for the 3.0 release
//
// Revision 1.54 2002/10/26 00:37:18 jbravo
// New multiple item code and added PB support to the UI
//
@ -760,5 +763,5 @@ void CG_InitConsoleCommands(void)
trap_AddCommand("reflogin");
trap_AddCommand("ref");
trap_AddCommand("refresign");
trap_AddCommand("debugshit");
// trap_AddCommand("debugshit");
}

17
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.130 2003/04/09 02:00:43 jbravo
// Fixed team none in DM and some final cleanups for the 3.0 release
//
// Revision 1.129 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
@ -1408,6 +1411,15 @@ char *ClientConnect(int clientNum, qboolean firstTime, qboolean isBot)
}
// JBravo: moved from ClientBegin
client->pers.enterTime = level.time;
// JBravo: ditto
if (g_gametype.integer == GT_FFA) {
client->sess.sessionTeam = TEAM_FREE;
client->sess.savedTeam = TEAM_FREE;
client->ps.persistant[PERS_TEAM] = TEAM_FREE;
client->sess.spectatorState = SPECTATOR_NOT;
client->specMode = SPECTATOR_NOT;
}
// JBravo: unlagged
/* if (g_delagHitscan.integer) {
trap_SendServerCommand(clientNum, "print \"^3This server is Unlagged: full lag compensation is ^1ON!\n\"");
@ -1495,12 +1507,13 @@ void ClientBegin(int clientNum)
client->camera->mode = CAMERA_MODE_SWING;
}
if (g_gametype.integer == GT_FFA) {
// JBravo: moved this up to clientconnect so DM players can join the spectator team.
/* if (g_gametype.integer == GT_FFA) {
client->sess.sessionTeam = TEAM_FREE;
client->ps.persistant[PERS_TEAM] = TEAM_FREE;
client->sess.spectatorState = SPECTATOR_NOT;
client->specMode = SPECTATOR_NOT;
}
} */
if (client->sess.sessionTeam != TEAM_SPECTATOR && g_gametype.integer != GT_TEAMPLAY) {
client->ps.persistant[PERS_WEAPONMODES] |= RQ3_GRENSHORT; //set to short range

11
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.185 2003/04/09 02:00:43 jbravo
// Fixed team none in DM and some final cleanups for the 3.0 release
//
// Revision 1.184 2003/03/30 00:36:03 jbravo
// Grenadebug when dropping bandolier
//
@ -811,10 +814,10 @@ void Cmd_Give_f(gentity_t * ent)
}
}
void RQ3_Cmd_debugshit (gentity_t * ent)
/*void RQ3_Cmd_debugshit (gentity_t * ent)
{
G_Printf("STAT_HOLDABLE_ITEM is %d, uniqueItems is %d\n", ent->client->ps.stats[STAT_HOLDABLE_ITEM], ent->client->uniqueItems);
}
} */
/*
==================
Cmd_God_f
@ -2955,8 +2958,8 @@ void ClientCommand(int clientNum)
// JBravo: adding tkok
else if (Q_stricmp(cmd, "tkok") == 0)
RQ3_Cmd_TKOk(ent);
else if (Q_stricmp(cmd, "debugshit") == 0)
RQ3_Cmd_debugshit(ent);
// else if (Q_stricmp(cmd, "debugshit") == 0)
// RQ3_Cmd_debugshit(ent);
//Elder: stuff for dropping items
else if (Q_stricmp(cmd, "dropitem") == 0)
Cmd_DropItem_f(ent);

5
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.141 2003/04/09 02:00:43 jbravo
// Fixed team none in DM and some final cleanups for the 3.0 release
//
// Revision 1.140 2003/03/29 15:04:03 jbravo
// Removing skin replacement cvars
//
@ -936,7 +939,7 @@ void G_RegisterCvars(void)
}
// JBravo: lets disable the untested modes.
if (g_gametype.integer != GT_FFA && g_gametype.integer != GT_TEAMPLAY && g_gametype.integer != GT_CTF &&
g_gametype.integer != GT_TOURNAMENT && g_gametype.integer != GT_TEAM) {
g_gametype.integer != GT_TEAM) {
G_Printf("g_gametype %i is currently not supported by ReactionQuake3. Defaulting to 0\n",
g_gametype.integer);
trap_Cvar_Set("g_gametype", "0");

14
reaction/game/zcam.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.22 2003/04/09 02:00:43 jbravo
// Fixed team none in DM and some final cleanups for the 3.0 release
//
// Revision 1.21 2003/04/02 22:23:51 jbravo
// More replacements tweaks. Added zcam_stfu
//
@ -720,7 +723,7 @@ static gentity_t *CameraSwingTarget(gentity_t * ent)
// JBravo: take teamnames into account
// JBravo: added who you are following to the zcam swing output.
// JBravo: that is if the client wants to see it
if (!ent->client->zcam_stfu)
if (!ent->client->zcam_stfu) {
trap_SendServerCommand(ent->client->ps.clientNum,
va("cp \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n%sFollowing " S_COLOR_WHITE "%s" S_COLOR_RED "/"
S_COLOR_MAGENTA "%s\n%sTracking " S_COLOR_WHITE "%s" S_COLOR_RED "/"
@ -728,14 +731,7 @@ static gentity_t *CameraSwingTarget(gentity_t * ent)
(target1st->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string,
color, target2nd->client->pers.netname,
(target2nd->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string));
//Makro - new code; disabled till everything is in place (cgame)
/*
trap_SendServerCommand(ent->client->ps.clientNum,
va("specPrint \"%s\" \"%s\" \"%s\" \"%s\"\n", target1st->client->pers.netname,
(target1st->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string,
target2nd->client->pers.netname,
(target2nd->client->sess.sessionTeam == TEAM_RED) ? g_RQ3_team1name.string : g_RQ3_team2name.string));
*/
}
}
return target2nd;