summaryrefslogtreecommitdiff
path: root/src/game/g_main.c
diff options
context:
space:
mode:
authorTony J. White <tjw@tjw.org>2006-12-29 23:31:57 +0000
committerTony J. White <tjw@tjw.org>2006-12-29 23:31:57 +0000
commitefbd4de85142909a5e5d30ed7812666f095c68cd (patch)
treeff03916b937a50d9731415624301424619f98e94 /src/game/g_main.c
parent717589aa42f483cf962b5a7bb55498108dc5c35a (diff)
* (bug 2973) support for multiple initial base layouts ( Risujin, vcxzet, tjw )
Diffstat (limited to 'src/game/g_main.c')
-rw-r--r--src/game/g_main.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c
index b4eea97b..16b40c0c 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -120,6 +120,9 @@ vmCvar_t g_shove;
vmCvar_t g_mapConfigs;
vmCvar_t g_chatTeamPrefix;
+vmCvar_t g_layouts;
+vmCvar_t g_layoutAuto;
+
vmCvar_t g_admin;
vmCvar_t g_adminLog;
vmCvar_t g_adminParseSay;
@@ -234,6 +237,9 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_mapConfigs, "g_mapConfigs", "", CVAR_ARCHIVE, 0, qfalse },
{ NULL, "g_mapConfigsLoaded", "0", CVAR_ROM, 0, qfalse },
+ { &g_layouts, "g_layouts", "", CVAR_LATCH, 0, qfalse },
+ { &g_layoutAuto, "g_layoutAuto", "1", CVAR_ARCHIVE, 0, qfalse },
+
{ &g_admin, "g_admin", "admin.dat", CVAR_ARCHIVE, 0, qfalse },
{ &g_adminLog, "g_adminLog", "admin.log", CVAR_ARCHIVE, 0, qfalse },
{ &g_adminParseSay, "g_adminParseSay", "1", CVAR_ARCHIVE, 0, qfalse },
@@ -590,9 +596,15 @@ void G_InitGame( int levelTime, int randomSeed, int restart )
trap_SetConfigstring( CS_INTERMISSION, "0" );
+ // test to see if a custom buildable layout will be loaded
+ G_LayoutSelect( );
+
// parse the key/value pairs and spawn gentities
G_SpawnEntitiesFromString( );
+ // load up a custom building layout if there is one
+ G_LayoutLoad( );
+
// the map might disable some things
BG_InitAllowedGameElements( );