diff options
Diffstat (limited to 'src/game/g_main.c')
| -rw-r--r-- | src/game/g_main.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index 7dc5bc8..2d0c788 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -26,12 +26,9 @@ TREMULOUS EDGE MOD SRC FILE =========================================================================== */ #include "g_local.h" -#include "edge_version.h" +#include "newedge_version.h" #define G_MOD_VERSION "Aardvark 0.5x" SVN_VERSION -#ifndef EDGE_MOD_VERSION -#define EDGE_MOD_VERSION "7.5.x" -#endif level_locals_t level; typedef struct @@ -194,8 +191,8 @@ vmCvar_t g_InstantRewardMultiplierH; vmCvar_t g_KillRewardMultiplierA; vmCvar_t g_KillRewardMultiplierH; vmCvar_t g_ConstantRewardFactor; -vmCvar_t g_TeamRewardFactor; -vmCvar_t g_PlayerRewardFactor; +vmCvar_t g_MinRewardFactor; +vmCvar_t g_MaxRewardFactor; vmCvar_t g_TimerPeriod; vmCvar_t g_TimerCommand; vmCvar_t g_ForceRandomTeams; @@ -209,6 +206,8 @@ vmCvar_t g_MinAlienExtraBuildPoints; vmCvar_t g_MaxAlienExtraBuildPoints; vmCvar_t g_MinHumanExtraBuildPoints; vmCvar_t g_MaxHumanExtraBuildPoints; +vmCvar_t g_BuildingCreditsFactor; + // copy cvars that can be set in worldspawn so they can be restored later static char cv_gravity[ MAX_CVAR_VALUE_STRING ]; @@ -224,7 +223,7 @@ static cvarTable_t gameCvarTable[ ] = { NULL, "gamename", GAME_VERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, { NULL, "gamedate", __DATE__ , CVAR_ROM, 0, qfalse }, { NULL, "g_version", G_MOD_VERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, - { NULL, "edge_version", EDGE_MOD_VERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, + { NULL, "newedge_version", NEWEDGE_MOD_VERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, { &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse }, { &g_lockTeamsAtStart, "g_lockTeamsAtStart", "0", CVAR_ROM, 0, qfalse }, { NULL, "sv_mapname", "", CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, @@ -369,9 +368,9 @@ static cvarTable_t gameCvarTable[ ] = { &g_InstantRewardMultiplierH, "g_InstantRewardMultiplierH", "1", CVAR_ARCHIVE, 0, qfalse }, { &g_KillRewardMultiplierA, "g_KillRewardMultiplierA", "1", CVAR_ARCHIVE, 0, qfalse }, { &g_KillRewardMultiplierH, "g_KillRewardMultiplierH", "1", CVAR_ARCHIVE, 0, qfalse }, - { &g_ConstantRewardFactor, "g_ConstantRewardFactor", "0.25", CVAR_ARCHIVE, 0, qfalse }, - { &g_TeamRewardFactor, "g_TeamRewardFactor", "0.5", CVAR_ARCHIVE, 0, qfalse }, - { &g_PlayerRewardFactor, "g_PlayerRewardFactor", "0.25", CVAR_ARCHIVE, 0, qfalse }, + { &g_ConstantRewardFactor, "g_ConstantRewardFactor", "0", CVAR_ARCHIVE, 0, qfalse }, + { &g_MinRewardFactor, "g_MinRewardFactor", "0.2", CVAR_ARCHIVE, 0, qfalse }, + { &g_MaxRewardFactor, "g_MaxRewardFactor", "5.0", CVAR_ARCHIVE, 0, qfalse }, { &g_TimerPeriod, "g_TimerPeriod", "0", CVAR_ARCHIVE, 0, qfalse }, { &g_TimerCommand, "g_TimerCommand", "", CVAR_ARCHIVE, 0, qfalse }, { &g_ForceRandomTeams, "g_ForceRandomTeams", "0", CVAR_ARCHIVE, 0, qfalse }, @@ -384,7 +383,8 @@ static cvarTable_t gameCvarTable[ ] = { &g_MinAlienExtraBuildPoints, "g_MinAlienExtraBuildPoints", "-800", CVAR_ARCHIVE, 0, qfalse }, { &g_MaxAlienExtraBuildPoints, "g_MaxAlienExtraBuildPoints", "800", CVAR_ARCHIVE, 0, qfalse }, { &g_MinHumanExtraBuildPoints, "g_MinHumanExtraBuildPoints", "-800", CVAR_ARCHIVE, 0, qfalse }, - { &g_MaxHumanExtraBuildPoints, "g_MaxHumanExtraBuildPoints", "800", CVAR_ARCHIVE, 0, qfalse } + { &g_MaxHumanExtraBuildPoints, "g_MaxHumanExtraBuildPoints", "800", CVAR_ARCHIVE, 0, qfalse }, + { &g_BuildingCreditsFactor, "g_BuildingCreditsFactor", "0.25", CVAR_ARCHIVE, 0, qfalse } }; static int gameCvarTableSize = sizeof( gameCvarTable ) / sizeof( gameCvarTable[ 0 ] ); @@ -651,7 +651,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) G_Printf( "------- Game Initialization -------\n" ); G_Printf( "gamename: %s\n", GAME_VERSION ); G_Printf( "gamedate: %s\n", __DATE__ ); - G_Printf( "EDGE VERSION: %s\n", EDGE_MOD_VERSION ); + G_Printf( "New EDGE version: %s\n", NEWEDGE_MOD_VERSION ); BG_InitMemory( ); // set some level globals @@ -661,10 +661,10 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) level.alienStage2Time = level.alienStage3Time = level.alienStage4Time = level.alienStage5Time = level.humanStage2Time = level.humanStage3Time = level.humanStage4Time = level.humanStage5Time = level.startTime; level.snd_fry = G_SoundIndex( "sound/misc/fry.wav" ); // FIXME standing in lava / slime - level.humanRewardKills = level.alienRewardKills = 0.0f; + level.humanRewardScore = level.alienRewardScore = 0.0f; level.alienNoBPFlashTime = level.humanNoBPFlashTime = -1; trap_Cvar_Set( "g_version", G_MOD_VERSION ); - trap_Cvar_Set( "edge_version", EDGE_MOD_VERSION ); + trap_Cvar_Set( "newedge_version", NEWEDGE_MOD_VERSION ); if( g_logFile.string[ 0 ] ) { if( g_logFileSync.integer ) |