diff options
author | Simon Howard | 2008-09-27 01:54:19 +0000 |
---|---|---|
committer | Simon Howard | 2008-09-27 01:54:19 +0000 |
commit | c33d1935292af81142783137e09dec828df298bc (patch) | |
tree | ab6757191ca595550282572df8340456ab720f65 /src/heretic | |
parent | c253a1522f6f286258bb6d753e5b01fbd887a880 (diff) | |
download | chocolate-doom-c33d1935292af81142783137e09dec828df298bc.tar.gz chocolate-doom-c33d1935292af81142783137e09dec828df298bc.tar.bz2 chocolate-doom-c33d1935292af81142783137e09dec828df298bc.zip |
Save Heretic configuration files on exit.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1294
Diffstat (limited to 'src/heretic')
-rw-r--r-- | src/heretic/d_main.c | 7 | ||||
-rw-r--r-- | src/heretic/d_net.c | 4 | ||||
-rw-r--r-- | src/heretic/doomdef.h | 4 | ||||
-rw-r--r-- | src/heretic/g_game.c | 4 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c index aed34a30..3f96a867 100644 --- a/src/heretic/d_main.c +++ b/src/heretic/d_main.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <stdlib.h> +#include "config.h" #include "ct_chat.h" #include "doomdef.h" #include "i_system.h" @@ -652,7 +653,7 @@ void blitStartup(void) _setbkcolor(4); // Red _settextcolor(14); // Yellow _settextposition(3, 47); - _outtext(VERSION_TEXT); + _outtext(HERETIC_VERSION_TEXT); // Hide cursor _settextcursor(0x2000); @@ -914,9 +915,11 @@ void D_DoomMain(void) // Load defaults before initing other systems printf("M_LoadDefaults: Load system defaults.\n"); + D_BindVariables(); + M_SetConfigFilenames("heretic.cfg", PROGRAM_PREFIX "heretic.cfg"); M_LoadDefaults(); - //I_AtExit(M_SaveDefaults, false); + I_AtExit(M_SaveDefaults, false); printf("Z_Init: Init zone memory allocation daemon.\n"); Z_Init(); diff --git a/src/heretic/d_net.c b/src/heretic/d_net.c index 4a67ad19..fb4240bc 100644 --- a/src/heretic/d_net.c +++ b/src/heretic/d_net.c @@ -521,7 +521,7 @@ void D_ArbitrateNetStart(void) continue; if (netbuffer->checksum & NCMD_SETUP) { - if (netbuffer->player != VERSION) + if (netbuffer->player != HERETIC_VERSION) I_Error ("Different DOOM versions cannot play a net game!"); startskill = netbuffer->retransmitfrom & 15; @@ -553,7 +553,7 @@ void D_ArbitrateNetStart(void) netbuffer->retransmitfrom |= 0x10; //netbuffer->starttic = startepisode * 64 + startmap; netbuffer->starttic = (startepisode << 4) + startmap; - netbuffer->player = VERSION; + netbuffer->player = HERETIC_VERSION; netbuffer->numtics = 0; HSendPacket(i, NCMD_SETUP); } diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h index 4aa4eee2..afadc19f 100644 --- a/src/heretic/doomdef.h +++ b/src/heretic/doomdef.h @@ -34,8 +34,8 @@ #endif #include <limits.h> -#define VERSION 130 -#define VERSION_TEXT "v1.3" +#define HERETIC_VERSION 130 +#define HERETIC_VERSION_TEXT "v1.3" // if rangecheck is undefined, most parameter validation debugging code // will not be compiled diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c index 70c19761..2e351fb4 100644 --- a/src/heretic/g_game.c +++ b/src/heretic/g_game.c @@ -1487,7 +1487,7 @@ void G_DoLoadGame(void) save_p = savebuffer + SAVESTRINGSIZE; // Skip the description field memset(vcheck, 0, sizeof(vcheck)); - sprintf(vcheck, "version %i", VERSION); + sprintf(vcheck, "version %i", HERETIC_VERSION); if (strcmp((char *) save_p, vcheck) != 0) { // Bad version return; @@ -1861,7 +1861,7 @@ void G_DoSaveGame(void) SV_Open(name); SV_Write(description, SAVESTRINGSIZE); memset(verString, 0, sizeof(verString)); - sprintf(verString, "version %i", VERSION); + sprintf(verString, "version %i", HERETIC_VERSION); SV_Write(verString, VERSIONSIZE); SV_WriteByte(gameskill); SV_WriteByte(gameepisode); |