From cf635a3ca70b50d373ce7dab3648d1a754bd92f2 Mon Sep 17 00:00:00 2001 From: Paradox460 Date: Sat, 22 Mar 2008 01:08:39 +0000 Subject: [PATCH] Added g_layoutVotePercent cvar, for setting percentages for layout votes. Added g_proximityMinesPrice cvar, for setting price of mines Layout now uses !restart instead of !map, to prevent client map reloads. --- src/game/bg_misc.c | 8 ++++---- src/game/g_cmds.c | 14 +++++++------- src/game/g_local.h | 2 ++ src/game/g_main.c | 6 +++++- src/game/tremulous.h | 3 ++- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index e661c4b..67c317e 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -3754,13 +3754,13 @@ int bg_numWeapons = sizeof( bg_weapons ) / sizeof( bg_weapons[ 0 ] ); BG_UpdateWeaponData ============== */ -void BG_UpdateWeaponData(int proximityMine) { +void BG_UpdateWeaponData(int proximityMine, int price) { int i; for(i=0; i 0 && level.numConnectedClients>1) ) { trap_SendServerCommand( ent-g_entities, va( - "print \"You cannot call for a mapchange after %d seconds\n\"", + "print \"You cannot call for a layout change after %d seconds\n\"", g_mapvoteMaxTime.integer ) ); G_admin_adminlog_log( ent, "vote", NULL, 0, qfalse ); return; @@ -1676,10 +1676,10 @@ void Cmd_CallVote_f( gentity_t *ent ) return; } - Com_sprintf( level.voteString, sizeof( level.voteString ), "!map %s %s", map, arg2 ); + Com_sprintf( level.voteString, sizeof( level.voteString ), "!restart %s", arg2 ); Com_sprintf( level.voteDisplayString, - sizeof( level.voteDisplayString ), "Change to map layout '%s'", arg2 ); - level.votePercentToPass = g_mapVotesPercent.integer; + sizeof( level.voteDisplayString ), "Change to layout '%s'", arg2 ); + level.votePercentToPass = g_layoutVotePercent.integer; } else if( !Q_stricmp( arg1, "draw" ) ) { @@ -2953,8 +2953,8 @@ void Cmd_Buy_f( gentity_t *ent ) qboolean buyingEnergyAmmo = qfalse; qboolean hasEnergyWeapon = qfalse; - BG_UpdateWeaponData(g_proximityMines.integer); - BG_UpdateUpgradeData(g_proximityMines.integer); + BG_UpdateWeaponData(g_proximityMines.integer, g_proximityMinesPrice.integer); + BG_UpdateUpgradeData(g_proximityMines.integer, g_proximityMinesPrice.integer); for( i = UP_NONE; i < UP_NUM_UPGRADES; i++ ) { diff --git a/src/game/g_local.h b/src/game/g_local.h index 8375083..5ce3861 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -1256,6 +1256,7 @@ extern vmCvar_t g_motd; extern vmCvar_t g_warmup; extern vmCvar_t g_doWarmup; extern vmCvar_t g_proximityMines; +extern vmCvar_t g_proximityMinesPrice; extern vmCvar_t g_blood; extern vmCvar_t g_allowVote; extern vmCvar_t g_voteLimit; @@ -1265,6 +1266,7 @@ extern vmCvar_t g_extendVotesPercent; extern vmCvar_t g_extendVotesTime; extern vmCvar_t g_extendVotesCount; extern vmCvar_t g_mapVotesPercent; +extern vmCvar_t g_layoutVotePercent; extern vmCvar_t g_designateVotes; extern vmCvar_t g_admitDefeatVotePercent; extern vmCvar_t g_teamAutoJoin; diff --git a/src/game/g_main.c b/src/game/g_main.c index fd86b67..07f5ba0 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -73,6 +73,7 @@ vmCvar_t g_synchronousClients; vmCvar_t g_warmup; vmCvar_t g_doWarmup; vmCvar_t g_proximityMines; +vmCvar_t g_proximityMinesPrice; vmCvar_t g_restarted; vmCvar_t g_lockTeamsAtStart; vmCvar_t g_logFile; @@ -88,6 +89,7 @@ vmCvar_t g_extendVotesPercent; vmCvar_t g_extendVotesTime; vmCvar_t g_extendVotesCount; vmCvar_t g_mapVotesPercent; +vmCvar_t g_layoutVotePercent; vmCvar_t g_designateVotes; vmCvar_t g_admitDefeatVotePercent; vmCvar_t g_teamAutoJoin; @@ -266,6 +268,7 @@ static cvarTable_t gameCvarTable[ ] = { &g_modWeaponReload, "g_modWeaponReload", "0", CVAR_ARCHIVE, 0, qfalse }, { &g_proximityMines, "g_proximityMines", "0", 0, 0, qtrue }, + { &g_proximityMinesPrice, "g_proximityMinesPrice", "800", 0, 0, qtrue }, { &g_teamAutoJoin, "g_teamAutoJoin", "0", CVAR_ARCHIVE }, { &g_teamForceBalance, "g_teamForceBalance", "1", CVAR_ARCHIVE }, { &g_buyAll, "g_buyAll", "0", CVAR_ARCHIVE, 0, qtrue }, @@ -313,6 +316,7 @@ static cvarTable_t gameCvarTable[ ] = { &g_extendVotesTime, "g_extendVotesTime", "10", CVAR_ARCHIVE, 0, qfalse }, { &g_extendVotesCount, "g_extendVotesCount", "3", CVAR_ARCHIVE, 0, qfalse }, { &g_mapVotesPercent, "g_mapVotesPercent", "50", CVAR_ARCHIVE, 0, qfalse }, + { &g_layoutVotePercent, "g_layoutVotePercent", "50", CVAR_ARCHIVE, 0, qfalse }, { &g_designateVotes, "g_designateVotes", "0", CVAR_ARCHIVE, 0, qfalse }, { &g_admitDefeatVotePercent, "g_admitDefeatVotePercent", "50", CVAR_ARCHIVE, 0, qfalse }, @@ -2318,7 +2322,7 @@ void CheckVote( void ) { G_admin_maplog_result( "m" ); } - else if( !Q_stricmpn( level.voteString, "!map", 4 ) ) + else if( !Q_stricmpn( level.voteString, "!restart", 8 ) ) { G_admin_maplog_result( "l" ); } diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 9466b1f..259da58 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -375,7 +375,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PROXIMITY_RANGE 100 #define PROXIMITY_CHECK_FREQUENCY 100 #define PROXIMITY_BOOM_TIME 20 -#define PROXIMITY_PRICE 800 +//Unused now because i(google) added a cvar to control this +//#define PROXIMITY_PRICE 800 #define SHOTGUN_PRICE 150 #define SHOTGUN_SHELLS 8