ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added new Cvar and removed unused Cvars 

* Added cvar rpg_spEasterEggs
* Removed some unused Cvars
This commit is contained in:
Walter Julius Hennecke 2012-11-10 13:18:30 +01:00
parent ed2201873e
commit bfd0a52b1b
3 changed files with 9 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
code/game/g_cmds.c
View File

@ -7922,66 +7922,6 @@ static void Cmd_SqlUserMod_f(gentity_t *ent) {
}
#endif
#ifdef OLDSQL
/*
=================
Cmd_SqlSetup_f
=================
*/
static void Cmd_SqlSetup_f(gentity_t *ent) {
int res;
int clientNum;
if(!sql_use.integer || !ent || !ent->client) return;
if(!IsAdmin(ent)) {
return;
}
clientNum = ent->client->ps.clientNum;
res = trap_SQL_CreateTables(sql_dbName.string);
switch(res) {
case 1:
trap_SendServerCommand(clientNum, "print \"Seems to have worked, check server log.\n\"");
break;
case 0:
trap_SendServerCommand(clientNum, "print \"An SQL Error occured, see server log for more information.\n\"");
break;
}
}
/*
=================
Cmd_SqlUserDel_f
=================
*/
static void Cmd_SqlUserDel_f(gentity_t *ent) {
char uName[MAX_TOKEN_CHARS];
int res;
int clientNum;
if(!sql_use.integer || !ent || !ent->client) return;
if(!IsAdmin(ent)) return;
if(trap_Argc() < 1) return;
clientNum = ent->client->ps.clientNum;
trap_Argv(1, uName, sizeof(uName));
res = trap_SQL_UserDel(sql_dbName.string, uName);
if(res) {
trap_SendServerCommand(clientNum, "print \"Seems to have worked.\n\"");
} else {
trap_SendServerCommand(clientNum, "print \"An SQL Error occured.\n\"");
}
}
#endif
/*
=================
Cmd_findEntitiesInRadius

31
code/game/g_local.h
View File

@ -1388,25 +1388,7 @@ extern vmCvar_t rpg_rifledmg;
extern vmCvar_t rpg_stasisdmg;
extern vmCvar_t rpg_imoddmg;
extern vmCvar_t rpg_noweapons;
//extern vmCvar_t rpg_marinepass;
//extern vmCvar_t rpg_securitypass;
//extern vmCvar_t rpg_adminpass;
//extern vmCvar_t rpg_medicalpass;
//extern vmCvar_t rpg_sciencepass;
//extern vmCvar_t rpg_commandpass;
//extern vmCvar_t rpg_engineerpass;
//extern vmCvar_t rpg_alienpass;
//extern vmCvar_t rpg_n00bpass;
//extern vmCvar_t rpg_alienflags;
//extern vmCvar_t rpg_marineflags;
//extern vmCvar_t rpg_securityflags;
//extern vmCvar_t rpg_adminflags;
//extern vmCvar_t rpg_medicalflags;
//extern vmCvar_t rpg_scienceflags;
//extern vmCvar_t rpg_commandflags;
//extern vmCvar_t rpg_engineerflags;
extern vmCvar_t rpg_welcomemessage;
//extern vmCvar_t rpg_timedmessage;
extern vmCvar_t rpg_timedmessagetime;
extern vmCvar_t rpg_message1;
extern vmCvar_t rpg_message2;
@ -1421,14 +1403,12 @@ extern vmCvar_t rpg_message10;
extern vmCvar_t rpg_forcekillradius;
extern vmCvar_t rpg_forcekillradiuswaittime;
//extern vmCvar_t rpg_noclipspectating;
extern vmCvar_t rpg_chatarearange;
extern vmCvar_t rpg_forcefielddamage;
extern vmCvar_t rpg_invisibletripmines;
extern vmCvar_t rpg_medicsrevive;
extern vmCvar_t rpg_effectsgun;
extern vmCvar_t rpg_phaserdisintegrates;
//extern vmCvar_t rpg_enabledranks;
extern vmCvar_t rpg_servershakeallclients;
extern vmCvar_t rpg_kickAfterXkills; //RPG-X | Phenix | 06/04/2005
extern vmCvar_t rpg_rankSet;
@ -1441,7 +1421,6 @@ extern vmCvar_t rpg_changeRanks;
extern vmCvar_t rpg_classSet;
extern vmCvar_t rpg_scannablePanels;
//extern vmCvar_t rpg_scannableForceField; //RPG-X | GSIO01 | 13/05/2009
extern vmCvar_t rpg_maxHeight;
extern vmCvar_t rpg_minHeight;
@ -1546,18 +1525,14 @@ extern vmCvar_t rpg_server6;
// SP level change
extern vmCvar_t rpg_allowSPLevelChange;
/* TODO some might be removed */
extern vmCvar_t sql_dbName;
// SQL Database
extern vmCvar_t sql_use;
extern vmCvar_t sql_server;
extern vmCvar_t sql_user;
extern vmCvar_t sql_password;
extern vmCvar_t sql_port;
extern vmCvar_t sql_hash;
// developer tools
extern vmCvar_t dev_showTriggers;
extern vmCvar_t rpg_spEasterEggs;
//RPG-X - Stephen: Some global varibles for RPG-X

23
code/game/g_main.c
View File

@ -312,14 +312,8 @@ vmCvar_t rpg_server6;
//! Allow target_levelchange to change the current level?
vmCvar_t rpg_allowSPLevelChange;
/* TODO some might be removed */
vmCvar_t sql_dbName; //!< Name of the SQL Database
/* SQL Database */
vmCvar_t sql_use; //!< Use SQL? 1 = mysql, 2 = sqlite
vmCvar_t sql_server; //!< SQL server to connect to (only mysql)
vmCvar_t sql_user; //!< SQL user for sql_server (only mysql)
vmCvar_t sql_password; //!< SQL password for sql_server (only mysql)
vmCvar_t sql_port; //!< SQL port to use to connect to sql_server (only mysql)
vmCvar_t sql_hash; //!< Specifies whether passwords should be hashed and what hash to use (only mysql)
// developer tools
vmCvar_t dev_showTriggers;
@ -333,6 +327,8 @@ vmCvar_t lua_allowedModules;
vmCvar_t g_developer;
vmCvar_t rpg_spEasterEggs;
static cvarTable_t gameCvarTable[] = {
// don't override the cheat state set by the system
@ -552,21 +548,14 @@ static cvarTable_t gameCvarTable[] = {
{ &rpg_server5, "rpg_server5", "0", CVAR_ARCHIVE, 0, qfalse },
{ &rpg_server6, "rpg_server6", "0", CVAR_ARCHIVE, 0, qfalse },
{ &rpg_allowSPLevelChange, "rpg_allowSPLevelChange", "1", CVAR_ARCHIVE | CVAR_LATCH, 0, qfalse },
{ &rpg_spEasterEggs, "rpg_spEasterEggs", "0", CVAR_ARCHIVE, 0, qfalse },
{ &dev_showTriggers, "dev_showTriggers", "0", CVAR_ARCHIVE, 0, qfalse }
{ &dev_showTriggers, "dev_showTriggers", "0", CVAR_ARCHIVE, 0, qfalse },
/* TODO some might be removed */
,
{ &sql_dbName, "sql_dbName", "rpgx", CVAR_ARCHIVE, 0, qfalse },
{ &sql_use, "sql_use", "0", CVAR_ARCHIVE, 0, qfalse },
{ &sql_password, "sql_password", "", CVAR_ARCHIVE, 0, qfalse },
{ &sql_port, "sql_port", "3306", CVAR_ARCHIVE, 0, qfalse },
{ &sql_server, "sql_server", "", CVAR_ARCHIVE, 0, qfalse },
{ &sql_user, "sql_user", "rpgx", CVAR_ARCHIVE, 0, qfalse },
{ &sql_hash, "sql_hash", "0", CVAR_ARCHIVE, 0, qfalse }
#ifdef G_LUA
,
{ &g_debugLua, "g_debugLua", "0", 0, 0, qfalse },
{ &lua_allowedModules, "lua_allowedModules", "", 0, 0, qfalse },
{ &lua_modules, "lua_modules", "", 0, 0, qfalse },