rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-04-03 00:12:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1 to zcam jitter. More is probably needed.

Browse source
This commit is contained in:
Richard Allen 2002-02-10 04:55:28 +00:00
parent 8174db0722
commit f72621755b
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reaction/Makefile
View file

@ -47,9 +47,9 @@ GOBJ = \
$(GDIRNAME)/ai_vcmd.o \
$(GDIRNAME)/rxn_game.o \
$(GDIRNAME)/g_teamplay.o \
$(GDIRNAME)/g_matchmode.o
# $(GDIRNAME)/zcam.o \
# $(GDIRNAME)/zcam_target.o
$(GDIRNAME)/g_matchmode.o \
$(GDIRNAME)/zcam.o \
$(GDIRNAME)/zcam_target.o
CGOBJ = \
$(CGDIRNAME)/cg_main.o \

5
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.23 2002/02/10 04:55:28 jbravo
// Fix #1 to zcam jitter. More is probably needed.
//
// Revision 1.22 2002/02/07 23:47:06 niceass
// Score sorting for >= GT_TEAM fixed
//
@ -565,7 +568,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
//Elder: spawn unique items.
// JBravo: unless we are in Teamplay
if ( g_gametype.integer != GT_TEAMPLAY ) {
RQ3_StartUniqueItems();
RQ3_StartUniqueItems();
}
// Elder: force sv_floodprotect to 0 -- remove when we finish

8
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.14 2002/02/10 04:55:28 jbravo
// Fix #1 to zcam jitter. More is probably needed.
//
// Revision 1.13 2002/02/09 00:10:12 jbravo
// Fixed spectator follow and free and updated zcam to 1.04 and added the
// missing zcam files.
@ -384,7 +387,7 @@ int WonGame(int winner)
trap_Cvar_Set("RQ3_Team2", "0");
MakeAllLivePlayersObservers ();
trap_SendServerCommand( -1, "cp \"Match is OVER !!!.\n\"");
return;
return 1;
}
}
else {
@ -492,8 +495,10 @@ void SpawnPlayers()
client->sess.teamSpawn = qtrue;
if (client->sess.savedTeam == TEAM_RED) {
client->sess.sessionTeam = TEAM_RED;
client->ps.persistant[PERS_TEAM] = TEAM_RED;
} else if (client->sess.savedTeam == TEAM_BLUE) {
client->sess.sessionTeam = TEAM_BLUE;
client->ps.persistant[PERS_TEAM] = TEAM_BLUE;
}
client->ps.stats[STAT_RQ3] &= ~RQ3_PLAYERSOLID;
ClientSpawn(player);
@ -686,6 +691,7 @@ void MakeSpectator( gentity_t *ent )
client->ps.stats[STAT_WEAPONS] = 0;
client->sess.savedTeam = client->sess.sessionTeam;
client->sess.sessionTeam = TEAM_SPECTATOR;
client->ps.persistant[PERS_TEAM] = TEAM_SPECTATOR;
ClientSpawn(ent);
}