rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-04-05 01:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added suport for callvote map <map> and ref map <map>.

Browse source
This commit is contained in:
Bruno Covachã 2002-06-23 03:04:09 +00:00
parent abd42e9a56
commit d91d93314b
4 changed files with 60 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.140 2002/06/23 03:04:09 assimon
// Added suport for callvote map <map> and ref map <map>.
//
// Revision 1.139 2002/06/21 00:05:55 slicer
// Spectators can now use say_team to communicate among each others, DM and TP
//
@ -1879,14 +1882,19 @@ void Cmd_CallVote_f(gentity_t * ent)
return;
}
trap_Cvar_VariableStringBuffer("nextmap", s, sizeof(s));
/* trap_Cvar_VariableStringBuffer("nextmap", s, sizeof(s));
if (*s) {
Com_sprintf(level.voteString, sizeof(level.voteString), "%s %s; set nextmap \"%s\"", arg1, arg2,
s);
} else {
Com_sprintf(level.voteString, sizeof(level.voteString), "%s %s", arg1, arg2);
}
Com_sprintf(level.voteDisplayString, sizeof(level.voteDisplayString), "%s", level.voteString);
*/
Com_sprintf(level.voteString, sizeof(level.voteString), "%s", arg1);
Com_sprintf(level.voteMap, sizeof(level.voteMap), "%s", arg2);
Com_sprintf(level.voteDisplayString, sizeof(level.voteDisplayString), "%s %s", level.voteString, level.voteMap);
} else if (!Q_stricmp(arg1, "cyclemap")) {
// char s[MAX_STRING_CHARS];

8
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.101 2002/06/23 03:04:09 assimon
// Added suport for callvote map <map> and ref map <map>.
//
// Revision 1.100 2002/06/21 21:02:49 niceass
// worldspawn laserfog check
//
@ -698,9 +701,12 @@ typedef struct {
int follow1, follow2; // clientNums for auto-follow spectators
int snd_fry; // sound index for standing in lava
int warmupModificationCount; // for detecting if g_warmup is changed
// voting state
// voting state
char voteString[MAX_STRING_CHARS];
char voteDisplayString[MAX_STRING_CHARS];
// vote extras
char voteMap[MAX_STRING_CHARS];
int voteTime; // level.time vote was called
int voteExecuteTime; // time the vote is executed
int voteYes;

27
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.95 2002/06/23 03:04:09 assimon
// Added suport for callvote map <map> and ref map <map>.
//
// Revision 1.94 2002/06/21 21:02:30 niceass
// worldspawn laserfog check
//
@ -17,7 +20,7 @@
//
// Revision 1.91 2002/06/19 18:13:57 jbravo
// New TNG spawning system :)
//
//o
// Revision 1.90 2002/06/19 05:21:43 niceass
// scoreboard stuff
//
@ -1500,7 +1503,8 @@ void BeginIntermission(void)
return; // already active
}
trap_SendServerCommand(-1, va("print \"Next map in rotation is %s\n\"", g_RQ3_NextMap.string));
if ( g_RQ3_ValidIniFile.integer == 1 )
trap_SendServerCommand(-1, va("print \"Next map in rotation is %s\n\"", g_RQ3_NextMap.string));
// if in tournement mode, change the wins / losses
if (g_gametype.integer == GT_TOURNAMENT) {
@ -2130,7 +2134,13 @@ void CheckVote(void)
if( Q_stricmp(level.voteString, "cyclemap") == 0)
BeginIntermission();
else
trap_SendConsoleCommand(EXEC_APPEND, va("%s\n", level.voteString));
if( Q_stricmp(level.voteString, "map") == 0){
trap_Cvar_Set("g_RQ3_ValidIniFile", "2"); // check this latter. This trap may not be necessary
g_RQ3_ValidIniFile.integer = 2;
BeginIntermission();
}
else
trap_SendConsoleCommand(EXEC_APPEND, va("%s\n", level.voteString));
}
if (!level.voteTime) {
return;
@ -2559,6 +2569,17 @@ void RQ3_ReadInitFile()
char *buf;
int len;
if ( g_RQ3_ValidIniFile.integer == 3 ){
trap_Cvar_Set( "g_RQ3_ValidIniFile", "1");
trap_SendConsoleCommand(EXEC_APPEND, va("%s\n", level.voteMap));
return;
}else
if ( g_RQ3_ValidIniFile.integer == 2 ){
trap_Cvar_Set( "g_RQ3_ValidIniFile", "1");
trap_SendConsoleCommand(EXEC_APPEND, va("%s %s\n", level.voteString, level.voteMap));
return;
}
len = trap_FS_FOpenFile(g_RQ3_IniFile.string, &file, FS_READ);
if (!file)

20
reaction/game/g_matchmode.c
View file

@ -414,6 +414,7 @@ qboolean Ref_Auth(gentity_t * ent)
void Ref_Command(gentity_t * ent)
{
char com[MAX_TOKEN_CHARS];
char param[MAX_TOKEN_CHARS];
int cn;
cn = ent - g_entities;
@ -433,6 +434,7 @@ void Ref_Command(gentity_t * ent)
trap_SendServerCommand(ent - g_entities, "print \"pause\n\"");
trap_SendServerCommand(ent - g_entities, "print \"cyclemap\n\"");
trap_SendServerCommand(ent - g_entities, "print\"lockSettings\n\"");
trap_SendServerCommand(ent - g_entities, "print\"map <map_to_go>\n\"");
return;
} else if (Q_stricmp(com, "lockSettings") == 0) {
if(level.settingsLocked)
@ -483,7 +485,23 @@ void Ref_Command(gentity_t * ent)
}
} else if (Q_stricmp(com, "cyclemap") == 0){
BeginIntermission();
} else
} else if (Q_stricmp(com, "map") == 0){
// get map name
trap_Argv(2, param, sizeof(param));
if ( !G_FileExists(va("maps/%s.bsp", param)) ) {
trap_SendServerCommand(ent - g_entities, va("print \"The map %s does not exist.\n\"", param));
return;
}
else{
trap_Cvar_Set("g_RQ3_ValidIniFile", "3");
g_RQ3_ValidIniFile.integer = 3;
trap_SendServerCommand(-1, va("print \"Referee changed next map to: %s\n\"", param));
Com_sprintf(level.voteMap, sizeof(level.voteMap), "map %s",param);
BeginIntermission();
}
}
else
trap_SendServerCommand(ent - g_entities,
"print \"Invalid Referee comand. Type ref help to see a list of available commands\n\"");
}