rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-13 08:27:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

RefID is now passed trought scoreboard, no more lca cvar, only cg.lca

Browse source
This commit is contained in:
Daniel Simoes 2002-06-10 13:20:03 +00:00
parent cd6b03a98c
commit 585853e98a
5 changed files with 43 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.88 2002/06/10 13:20:03 slicer
// RefID is now passed trought scoreboard, no more lca cvar, only cg.lca
//
// Revision 1.87 2002/06/09 05:16:17 niceass
// pressure change
//
@ -934,7 +937,12 @@ typedef struct {
int records[REC_NUM_RECORDS]; // Blaze: for our statistics tracking
float loadingMapPercent; // NiceAss: Ranges from 0 to 1. Used on map load.
//Slicer vars that are synched from GAME
int lca;
// NiceAss: Scoreboard MM stuff:
int refID;
int matchTime;
int team1ready;
int team2ready;
@ -1714,7 +1722,8 @@ extern vmCvar_t cg_RQ3_autoAction;
//Blaze: Cheat cvars
extern cheat_cvar cheats[30];
// JBravo: Teamplay cvars synched from game
extern vmCvar_t cg_RQ3_lca;
//Slicer: no longer needed.
//extern vmCvar_t cg_RQ3_lca;
extern vmCvar_t cg_RQ3_team_round_going;
extern vmCvar_t cg_RQ3_team1name;
extern vmCvar_t cg_RQ3_team2name;
@ -1722,7 +1731,7 @@ extern vmCvar_t ui_RQ3_teamCount1;
extern vmCvar_t ui_RQ3_teamCount2;
extern vmCvar_t ui_RQ3_numSpectators;
//Slicer: matchmode team status cvars
extern vmCvar_t cg_RQ3_RefID;
//extern vmCvar_t cg_RQ3_RefID;
extern vmCvar_t cg_RQ3_matchmode;

13
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.78 2002/06/10 13:20:03 slicer
// RefID is now passed trought scoreboard, no more lca cvar, only cg.lca
//
// Revision 1.77 2002/06/09 18:58:40 makro
// no message
//
@ -370,7 +373,8 @@ vmCvar_t cg_obeliskRespawnDelay;
//Blaze: cheat struct
cheat_cvar cheats[30];
// JBravo: Teamplay cvars synced from game
vmCvar_t cg_RQ3_lca;
//Slicer: no longer needed.
//vmCvar_t cg_RQ3_lca;
vmCvar_t cg_RQ3_team_round_going;
vmCvar_t cg_RQ3_team1name;
vmCvar_t cg_RQ3_team2name;
@ -379,7 +383,7 @@ vmCvar_t ui_RQ3_teamCount2;
vmCvar_t ui_RQ3_numSpectators;
//Slicer: matchmode team status cvars
vmCvar_t cg_RQ3_RefID;
//vmCvar_t cg_RQ3_RefID;
vmCvar_t cg_RQ3_matchmode;
// NiceAss: Taken out of the missionpack
vmCvar_t cg_enableBreath;
@ -547,7 +551,8 @@ static cvarTable_t cvarTable[] = { // bk001129
//Makro - avidemo with jpegs
{ &cg_RQ3_avidemo, "cg_RQ3_avidemo", "0", 0 },
// JBravo: added
{ &cg_RQ3_lca, "cg_RQ3_lca", "0", CVAR_ROM},
//Slicer: no longer needed.
// { &cg_RQ3_lca, "cg_RQ3_lca", "0", CVAR_ROM},
{ &cg_RQ3_team_round_going, "cg_RQ3_team_round_going", "0", CVAR_ROM},
{ &cg_RQ3_team1name, "g_RQ3_team1name", "0", 0},
{ &cg_RQ3_team2name, "g_RQ3_team2name", "0", 0},
@ -557,7 +562,7 @@ static cvarTable_t cvarTable[] = { // bk001129
{ &cg_gravity, "g_gravity", "800", 0},
//Slicer: Team Status Cvars for MM
{ &cg_RQ3_matchmode, "g_RQ3_matchmode", "0", 0},
{ &cg_RQ3_RefID, "g_RQ3_RefID", "0", 0}
//{ &cg_RQ3_RefID, "g_RQ3_RefID", "0", 0}
// { &cg_pmove_fixed, "cg_pmove_fixed", "0", CVAR_USERINFO | CVAR_ARCHIVE }
};

6
reaction/cgame/cg_predict.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.21 2002/06/10 13:20:03 slicer
// RefID is now passed trought scoreboard, no more lca cvar, only cg.lca
//
// Revision 1.20 2002/06/03 05:23:22 niceass
// spectator changes
//
@ -641,7 +644,8 @@ void CG_PredictPlayerState( void ) {
}*/
// JBravo: setting lca in pm if needed
if (cg_RQ3_lca.integer == 1)
//if (cg_RQ3_lca.integer == 1)
if(cg.lca)
cg_pmove.lca = qtrue;
else
cg_pmove.lca = qfalse;

8
reaction/cgame/cg_scoreboard.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.33 2002/06/10 13:20:03 slicer
// RefID is now passed trought scoreboard, no more lca cvar, only cg.lca
//
// Revision 1.32 2002/06/05 23:39:23 niceass
// small change in wording
//
@ -315,9 +318,10 @@ static int CG_TeamplayScoreboard(void)
}
// MATCHMODE / TEAMPLAY for showing Referee
if ( cg_RQ3_matchmode.integer && cg_RQ3_RefID.integer >= 0) {
//if ( cg_RQ3_matchmode.integer && cg_RQ3_RefID.integer >= 0) {
if ( cg_RQ3_matchmode.integer && cg.refID >= 0) {
DrawStrip(y, SB_FONTSIZEH, qtrue, qtrue, qtrue, GreyL, colorBlack);
ci = &cgs.clientinfo[ cg_RQ3_RefID.integer ];
ci = &cgs.clientinfo[ cg.refID ];
DrawLeftStripText(y, SB_FONTSIZEH, "Referee:", 100, colorBlack);
DrawRightStripText(y, SB_FONTSIZEH, ci->name, 30, colorBlack);
y += SB_FONTSIZEH+SB_PADDING*4+2;

17
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.46 2002/06/10 13:20:03 slicer
// RefID is now passed trought scoreboard, no more lca cvar, only cg.lca
//
// Revision 1.45 2002/06/03 00:47:06 niceass
// match scoreboard changes
//
@ -174,6 +177,8 @@ static void CG_ParseScores( void ) {
cg.team1ready = atoi( CG_Argv( 4 ) );
cg.team2ready = atoi( CG_Argv( 5 ) );
cg.matchTime = atoi( CG_Argv( 6 ) );
cg.refID = atoi ( CG_Argv ( 7 ) );
memset( cg.scores, 0, sizeof( cg.scores ) );
for ( i = 0 ; i < cg.numScores ; i++ ) {
@ -1242,7 +1247,8 @@ void CG_RQ3_Cmd () {
switch(cmd) {
case LIGHTS:
trap_Cvar_Set("cg_RQ3_lca", "1");
cg.lca = 1;
//trap_Cvar_Set("cg_RQ3_lca", "1");
cg.showScores = qfalse;
cg.scoreTPMode = 0;
CG_CenterPrint( "LIGHTS...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
@ -1257,7 +1263,8 @@ void CG_RQ3_Cmd () {
case ACTION:
CG_CenterPrint( "ACTION!", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
CG_Printf("\nACTION!\n");
trap_Cvar_Set("cg_RQ3_lca", "0");
cg.lca = 0;
// trap_Cvar_Set("cg_RQ3_lca", "0");
CG_AddBufferedSound(cgs.media.actionSound);
break;
/*case SETTEAMPLAYERS:
@ -1283,8 +1290,8 @@ void CG_RQ3_Cmd () {
case ROUND:
trap_Cvar_Set("cg_RQ3_team_round_going", CG_Argv(1));
break;
case MAPSTART:
break;
case MAPSTART:
break;
case STARTDEMO:
switch (cg_RQ3_autoAction.integer) {
case 1:
@ -1500,7 +1507,7 @@ static void CG_ServerCommand( void ) {
cg.levelShot = qtrue;
return;
}
//Blaze: Dont think q3 can do
//Blaze: Dont think q3 can d
/*if ( !strcmp( cmd, "numCheatVars" ) )
{//set and clear the cheatvar structure
int numCheats;