rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-17 01:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bye bye LCA lag

Browse source
This commit is contained in:
Richard Allen 2002-03-26 10:32:52 +00:00
parent 29f340b182
commit c7ff311b9c
7 changed files with 58 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.51 2002/03/26 10:32:51 jbravo
// Bye bye LCA lag
//
// Revision 1.50 2002/03/23 05:50:47 jbravo // Revision 1.50 2002/03/23 05:50:47 jbravo
// Moved enableDust out of the missionpack // Moved enableDust out of the missionpack
// //
@ -438,8 +441,8 @@ static cvarTable_t cvarTable[] = { // bk001129
{ &cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE}, { &cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE},
{ &cg_trueLightning, "cg_trueLightning", "0.0", CVAR_ARCHIVE}, { &cg_trueLightning, "cg_trueLightning", "0.0", CVAR_ARCHIVE},
// JBravo: added // JBravo: added
{ &cg_RQ3_lca, "g_RQ3_lca", "0", 0}, { &cg_RQ3_lca, "cg_RQ3_lca", "0", CVAR_ROM},
{ &cg_RQ3_team_round_going, "g_RQ3_team_round_going", "0", 0}, { &cg_RQ3_team_round_going, "cg_RQ3_team_round_going", "0", CVAR_ROM},
{ &cg_RQ3_team1name, "g_RQ3_team1name", "0", 0}, { &cg_RQ3_team1name, "g_RQ3_team1name", "0", 0},
{ &cg_RQ3_team2name, "g_RQ3_team2name", "0", 0}, { &cg_RQ3_team2name, "g_RQ3_team2name", "0", 0},
{ &cg_gravity, "g_gravity", "0", 0}, { &cg_gravity, "g_gravity", "0", 0},

10
reaction/cgame/cg_playerstate.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.18 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
// Revision 1.17 2002/03/13 18:41:18 slicer // Revision 1.17 2002/03/13 18:41:18 slicer
// Adjusted some of elder's unzoom code for the new sniper system ( server side ) // Adjusted some of elder's unzoom code for the new sniper system ( server side )
// //
@ -515,11 +518,12 @@ void CG_CheckLocalSounds( playerState_t *ps, playerState_t *ops ) {
int msec; int msec;
msec = cg.time - cgs.levelStartTime; msec = cg.time - cgs.levelStartTime;
if ( !( cg.timelimitWarnings & 4 ) && msec > ( cgs.timelimit * 60 + 2 ) * 1000 ) { // JBravo: we dont want the sudden death sound in RQ3
/* if ( !( cg.timelimitWarnings & 4 ) && msec > ( cgs.timelimit * 60 + 2 ) * 1000 ) {
cg.timelimitWarnings |= 1 | 2 | 4; cg.timelimitWarnings |= 1 | 2 | 4;
if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.suddenDeathSound, CHAN_ANNOUNCER ); if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.suddenDeathSound, CHAN_ANNOUNCER );
} } */
else if ( !( cg.timelimitWarnings & 2 ) && msec > (cgs.timelimit - 1) * 60 * 1000 ) { if ( !( cg.timelimitWarnings & 2 ) && msec > (cgs.timelimit - 1) * 60 * 1000 ) {
cg.timelimitWarnings |= 1 | 2; cg.timelimitWarnings |= 1 | 2;
if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.oneMinuteSound, CHAN_ANNOUNCER ); if (cg_RQ3_anouncer.integer == 1) trap_S_StartLocalSound( cgs.media.oneMinuteSound, CHAN_ANNOUNCER );
} }

16
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.24 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
// Revision 1.23 2002/03/17 03:35:29 jbravo // Revision 1.23 2002/03/17 03:35:29 jbravo
// More radio tewaks and cleanups. // More radio tewaks and cleanups.
// //
@ -1252,20 +1255,33 @@ static void CG_ServerCommand( void ) {
// NiceAss: LCA // NiceAss: LCA
if ( !strcmp( cmd, "lights") ) { if ( !strcmp( cmd, "lights") ) {
trap_Cvar_Set("cg_RQ3_lca", "1");
CG_CenterPrint( "LIGHTS...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH ); CG_CenterPrint( "LIGHTS...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
CG_Printf("\nLIGHTS...\n");
CG_AddBufferedSound(cgs.media.lightsSound); CG_AddBufferedSound(cgs.media.lightsSound);
return; return;
} }
if ( !strcmp( cmd, "camera") ) { if ( !strcmp( cmd, "camera") ) {
CG_CenterPrint( "CAMERA...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH ); CG_CenterPrint( "CAMERA...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
CG_Printf("\nCAMERA...\n");
CG_AddBufferedSound(cgs.media.cameraSound); CG_AddBufferedSound(cgs.media.cameraSound);
return; return;
} }
if ( !strcmp( cmd, "action") ) { if ( !strcmp( cmd, "action") ) {
CG_CenterPrint( "ACTION!", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH ); CG_CenterPrint( "ACTION!", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
CG_Printf("\nACTION!\n");
trap_Cvar_Set("cg_RQ3_lca", "0");
CG_AddBufferedSound(cgs.media.actionSound); CG_AddBufferedSound(cgs.media.actionSound);
return; return;
} }
if ( !strcmp( cmd, "roundbegin") ) {
trap_Cvar_Set("cg_RQ3_team_round_going", "1");
return;
}
if ( !strcmp( cmd, "roundend") ) {
trap_Cvar_Set("cg_RQ3_team_round_going", "0");
return;
}
// JBravo: radio. This implementation rules. Used to suck :) // JBravo: radio. This implementation rules. Used to suck :)
if (!strcmp(cmd, "playradiosound")) { if (!strcmp(cmd, "playradiosound")) {
int sound, gender; int sound, gender;

7
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.53 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
// Revision 1.52 2002/03/17 23:43:43 slicer // Revision 1.52 2002/03/17 23:43:43 slicer
// Made Bots visible again at DM // Made Bots visible again at DM
// //
@ -1594,6 +1597,8 @@ void ClientSpawn(gentity_t *ent) {
// initialize animations and other things // initialize animations and other things
client->ps.commandTime = level.time - 100; client->ps.commandTime = level.time - 100;
ent->client->pers.cmd.serverTime = level.time; ent->client->pers.cmd.serverTime = level.time;
// JBravo: We should not have to call this during TP spawns
if (g_gametype.integer != GT_TEAMPLAY)
ClientThink( ent-g_entities ); ClientThink( ent-g_entities );
// positively link the client, even if the command times are weird // positively link the client, even if the command times are weird
@ -1604,6 +1609,8 @@ void ClientSpawn(gentity_t *ent) {
} }
// run the presend to set anything else // run the presend to set anything else
// JBravo: We should not have to call this during TP spawns
if (g_gametype.integer != GT_TEAMPLAY)
ClientEndFrame( ent ); ClientEndFrame( ent );
//Blaze: Send cheat cvars to client //Blaze: Send cheat cvars to client

4
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.58 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
// Revision 1.57 2002/03/25 14:55:00 jbravo // Revision 1.57 2002/03/25 14:55:00 jbravo
// teamCount cvars for Makro // teamCount cvars for Makro
// //
@ -1133,7 +1136,6 @@ extern vmCvar_t g_RQ3_sniperup; // JBravo: 0 = snipers begin with pistol, 1 =
extern vmCvar_t g_RQ3_team1name; // JBravo: cvar for the name of team 1 extern vmCvar_t g_RQ3_team1name; // JBravo: cvar for the name of team 1
extern vmCvar_t g_RQ3_team2name; // JBravo: cvar for the name of team 2 extern vmCvar_t g_RQ3_team2name; // JBravo: cvar for the name of team 2
extern vmCvar_t g_RQ3_lca; // JBravo: cvar to signal cgame that LCA is in progress extern vmCvar_t g_RQ3_lca; // JBravo: cvar to signal cgame that LCA is in progress
extern vmCvar_t g_RQ3_team_round_going; // JBravo: cvar to signal cgame that a round is in progress
extern vmCvar_t g_RQ3_teamCount1; // JBravo: cvar for the UI join menus extern vmCvar_t g_RQ3_teamCount1; // JBravo: cvar for the UI join menus
extern vmCvar_t g_RQ3_teamCount2; // JBravo: cvar for the UI join menus extern vmCvar_t g_RQ3_teamCount2; // JBravo: cvar for the UI join menus
extern vmCvar_t g_RQ3_numSpectators; // JBravo: cvar for the UI join menus extern vmCvar_t g_RQ3_numSpectators; // JBravo: cvar for the UI join menus

11
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.39 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
// Revision 1.38 2002/03/25 14:55:00 jbravo // Revision 1.38 2002/03/25 14:55:00 jbravo
// teamCount cvars for Makro // teamCount cvars for Makro
// //
@ -174,7 +177,6 @@ vmCvar_t g_RQ3_tgren;
vmCvar_t g_RQ3_limchasecam; vmCvar_t g_RQ3_limchasecam;
vmCvar_t g_RQ3_sniperup; vmCvar_t g_RQ3_sniperup;
vmCvar_t g_RQ3_lca; vmCvar_t g_RQ3_lca;
vmCvar_t g_RQ3_team_round_going;
vmCvar_t g_RQ3_team1name; vmCvar_t g_RQ3_team1name;
vmCvar_t g_RQ3_team2name; vmCvar_t g_RQ3_team2name;
vmCvar_t g_RQ3_teamCount1; vmCvar_t g_RQ3_teamCount1;
@ -318,11 +320,10 @@ static cvarTable_t gameCvarTable[] = {
{ &g_RQ3_teamCount1, "g_RQ3_teamCount1", "0", CVAR_SYSTEMINFO, 0, qfalse }, { &g_RQ3_teamCount1, "g_RQ3_teamCount1", "0", CVAR_SYSTEMINFO, 0, qfalse },
{ &g_RQ3_teamCount2, "g_RQ3_teamCount2", "0", CVAR_SYSTEMINFO, 0, qfalse }, { &g_RQ3_teamCount2, "g_RQ3_teamCount2", "0", CVAR_SYSTEMINFO, 0, qfalse },
{ &g_RQ3_numSpectators, "g_RQ3_numSpectators", "0", CVAR_SYSTEMINFO, 0, qfalse }, { &g_RQ3_numSpectators, "g_RQ3_numSpectators", "0", CVAR_SYSTEMINFO, 0, qfalse },
{ &g_RQ3_lca, "g_RQ3_lca", "0", CVAR_SYSTEMINFO, 0, qfalse}, { &g_RQ3_lca, "g_RQ3_lca", "0", 0, 0, qfalse},
{ &g_RQ3_team_round_going, "g_RQ3_team_round_going", "0", CVAR_SYSTEMINFO, 0, qfalse},
//Slicer: Team Status Cvars for MM //Slicer: Team Status Cvars for MM
{ &RQ3_team1, "RQ3_team1", "0", CVAR_SYSTEMINFO, 0, qfalse}, { &RQ3_team1, "RQ3_team1", "0", 0, 0, qfalse},
{ &RQ3_team2, "RQ3_team2", "0", CVAR_SYSTEMINFO, 0, qfalse}, { &RQ3_team2, "RQ3_team2", "0", 0, 0, qfalse},
// aasimon: Ref system for MM,added infor for referee id (clientnumber) // aasimon: Ref system for MM,added infor for referee id (clientnumber)
{ &g_RQ3_AllowRef, "g_RQ3_AllowRef", "0", CVAR_SERVERINFO, 0, qtrue}, { &g_RQ3_AllowRef, "g_RQ3_AllowRef", "0", CVAR_SERVERINFO, 0, qtrue},
{ &g_RQ3_RefPass, "g_RQ3_RefPassword", "", CVAR_USERINFO, 0, qfalse}, { &g_RQ3_RefPass, "g_RQ3_RefPassword", "", CVAR_USERINFO, 0, qfalse},

25
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.45 2002/03/26 10:32:52 jbravo
// Bye bye LCA lag
//
// Revision 1.44 2002/03/25 14:55:01 jbravo // Revision 1.44 2002/03/25 14:55:01 jbravo
// teamCount cvars for Makro // teamCount cvars for Makro
// //
@ -169,7 +172,6 @@ void CheckTeamRules()
if(level.intermissiontime) if(level.intermissiontime)
return; return;
level.fps = trap_Cvar_VariableIntegerValue("sv_fps"); level.fps = trap_Cvar_VariableIntegerValue("sv_fps");
if (level.lights_camera_action) { if (level.lights_camera_action) {
@ -232,7 +234,7 @@ void CheckTeamRules()
if(level.matchTime >= g_timelimit.integer * 60) { if(level.matchTime >= g_timelimit.integer * 60) {
level.inGame = level.team_round_going = level.team_round_countdown = level.inGame = level.team_round_going = level.team_round_countdown =
level.team_game_going = level.matchTime = 0; level.team_game_going = level.matchTime = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
trap_Cvar_Set("RQ3_Team1", "0"); trap_Cvar_Set("RQ3_Team1", "0");
trap_Cvar_Set("RQ3_Team2", "0"); trap_Cvar_Set("RQ3_Team2", "0");
MakeAllLivePlayersObservers (); MakeAllLivePlayersObservers ();
@ -246,7 +248,7 @@ void CheckTeamRules()
trap_SendServerCommand( -1, "print \"Timelimit hit.\n\"" ); trap_SendServerCommand( -1, "print \"Timelimit hit.\n\"" );
//trap_SendServerCommand( -1, va("cp \"Timelimit hit.\n\"")); //trap_SendServerCommand( -1, va("cp \"Timelimit hit.\n\""));
level.team_round_going = level.team_round_countdown = level.team_game_going = 0; level.team_round_going = level.team_round_countdown = level.team_game_going = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
//Slicer: Start Intermission //Slicer: Start Intermission
BeginIntermission(); BeginIntermission();
return; return;
@ -270,7 +272,7 @@ void CheckTeamRules()
if (WonGame(winner)) if (WonGame(winner))
return; return;
level.team_round_going = 0; level.team_round_going = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
level.lights_camera_action = 0; level.lights_camera_action = 0;
level.holding_on_tie_check = 0; level.holding_on_tie_check = 0;
level.team_round_countdown = (71*level.fps)/10; level.team_round_countdown = (71*level.fps)/10;
@ -284,7 +286,7 @@ void CheckTeamRules()
if (WonGame(winner)) if (WonGame(winner))
return; return;
level.team_round_going = 0; level.team_round_going = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
level.lights_camera_action = 0; level.lights_camera_action = 0;
level.holding_on_tie_check = 0; level.holding_on_tie_check = 0;
level.team_round_countdown = (71*level.fps)/10; level.team_round_countdown = (71*level.fps)/10;
@ -305,7 +307,6 @@ void StartLCA()
SpawnPlayers(); SpawnPlayers();
trap_SendServerCommand( -1, "lights"); trap_SendServerCommand( -1, "lights");
trap_SendServerCommand( -1, "print \"\n------------------\nLIGHTS...\n\"");
} }
void ContinueLCA() void ContinueLCA()
@ -315,14 +316,12 @@ void ContinueLCA()
if (level.lights_camera_action == (21*level.fps)/10) { if (level.lights_camera_action == (21*level.fps)/10) {
trap_SendServerCommand( -1, "camera"); trap_SendServerCommand( -1, "camera");
trap_SendServerCommand( -1, "print \"\nCAMERA...\n\"");
} }
else if (level.lights_camera_action == 1) { else if (level.lights_camera_action == 1) {
trap_SendServerCommand( -1, "action"); trap_SendServerCommand( -1, "action");
trap_SendServerCommand( -1, "print \"\nACTION!\n\n\"");
trap_Cvar_Set("g_RQ3_lca", "0"); trap_Cvar_Set("g_RQ3_lca", "0");
level.team_round_going = 1; level.team_round_going = 1;
trap_Cvar_Set("g_RQ3_team_round_going", "1"); trap_SendServerCommand( -1, "roundbegin");
level.current_round_length = 0; level.current_round_length = 0;
} }
level.lights_camera_action--; level.lights_camera_action--;
@ -485,7 +484,7 @@ int WonGame(int winner)
if(level.matchTime >= g_timelimit.integer * 60) { if(level.matchTime >= g_timelimit.integer * 60) {
level.inGame = level.team_round_going = level.team_round_countdown = level.inGame = level.team_round_going = level.team_round_countdown =
level.team_game_going = level.matchTime = 0; level.team_game_going = level.matchTime = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
trap_Cvar_Set("RQ3_Team1", "0"); trap_Cvar_Set("RQ3_Team1", "0");
trap_Cvar_Set("RQ3_Team2", "0"); trap_Cvar_Set("RQ3_Team2", "0");
MakeAllLivePlayersObservers (); MakeAllLivePlayersObservers ();
@ -497,7 +496,7 @@ int WonGame(int winner)
if(level.time - level.startTime >= g_timelimit.integer*60000) { if(level.time - level.startTime >= g_timelimit.integer*60000) {
trap_SendServerCommand( -1, "print \"Timelimit hit.\n\"" ); trap_SendServerCommand( -1, "print \"Timelimit hit.\n\"" );
level.team_round_going = level.team_round_countdown = level.team_game_going = 0; level.team_round_going = level.team_round_countdown = level.team_game_going = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
//Slicer: Start Intermission //Slicer: Start Intermission
BeginIntermission(); BeginIntermission();
return 1; return 1;
@ -511,7 +510,7 @@ int WonGame(int winner)
if(g_RQ3_matchmode.integer) { if(g_RQ3_matchmode.integer) {
level.inGame = level.team_round_going = level.team_round_countdown = level.inGame = level.team_round_going = level.team_round_countdown =
level.team_game_going = level.matchTime = 0; level.team_game_going = level.matchTime = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
trap_Cvar_Set("RQ3_Team1", "0"); trap_Cvar_Set("RQ3_Team1", "0");
trap_Cvar_Set("RQ3_Team2", "0"); trap_Cvar_Set("RQ3_Team2", "0");
MakeAllLivePlayersObservers (); MakeAllLivePlayersObservers ();
@ -523,7 +522,7 @@ int WonGame(int winner)
trap_SendServerCommand( -1, "print \"Roundlimit hit.\n\"" ); trap_SendServerCommand( -1, "print \"Roundlimit hit.\n\"" );
trap_SendServerCommand( -1, va("cp \"Roundlimit hit.\n\"")); trap_SendServerCommand( -1, va("cp \"Roundlimit hit.\n\""));
level.team_round_going = level.team_round_countdown = level.team_game_going = 0; level.team_round_going = level.team_round_countdown = level.team_game_going = 0;
trap_Cvar_Set("g_RQ3_team_round_going", "0"); trap_SendServerCommand( -1, "roundend");
//Slicer: Start Intermission //Slicer: Start Intermission
BeginIntermission(); BeginIntermission();
return 1; return 1;