From be84374899bee733d31dacd411f17077ff15966e Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 25 Dec 2011 15:31:30 +0000 Subject: [PATCH] Remove written-out savegame.c function declarations from demo.c and include savegame.h instead. git-svn-id: https://svn.eduke32.com/eduke32@2198 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/demo.c | 12 ++---------- polymer/eduke32/source/demo.h | 2 -- polymer/eduke32/source/game.h | 5 ----- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/polymer/eduke32/source/demo.c b/polymer/eduke32/source/demo.c index 7a8d9f5b0..6ebc08ee9 100644 --- a/polymer/eduke32/source/demo.c +++ b/polymer/eduke32/source/demo.c @@ -23,8 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "duke3d.h" #include "demo.h" #include "menus.h" +#include "savegame.h" -char firstdemofile[80] = { '\0' }; +char firstdemofile[80]; FILE *g_demo_filePtr = (FILE *)NULL; int32_t g_demo_cnt; @@ -67,7 +68,6 @@ void demo_preparewarp(void) S_ClearSoundLocks(); } -extern int32_t sv_loadsnapshot(int32_t fil, int32_t *ret_hasdiffs, int32_t *ret_demoticcnt, int32_t *ret_synccompress); int32_t G_OpenDemoRead(int32_t g_whichDemo) // 0 = mine { @@ -132,7 +132,6 @@ void G_OpenDemoWrite(void) { char d[14]; int32_t i, demonum=1; - extern int32_t sv_saveandmakesnapshot(FILE* fil, int32_t recdiffs, int32_t diffcompress, int32_t synccompress); if (ud.recstat == 2) kclose(g_demo_recFilePtr); @@ -230,7 +229,6 @@ static void dowritesync() void G_DemoRecord(void) { int16_t i; - extern uint32_t sv_writediff(FILE *fil); g_demo_cnt++; @@ -255,8 +253,6 @@ void G_DemoRecord(void) void G_CloseDemoWrite(void) { - extern void sv_freemem(); - if (ud.recstat == 1) { if (ud.reccnt > 0) @@ -283,7 +279,6 @@ void G_CloseDemoWrite(void) } static int32_t g_whichDemo = 1; -extern int32_t sv_updatestate(int32_t frominit); static int32_t doupdatestate(int32_t frominit) { @@ -416,7 +411,6 @@ RECHECK: } else { - //loadfrombeg: // j = sv_loadsnapshot(g_demo_recFilePtr, &g_demo_totalCnt); j = doupdatestate(1); if (!j) @@ -459,8 +453,6 @@ RECHECK: DOREADSYNC(3); else if (demo_hasdiffs && Bmemcmp(tmpbuf, "dIfF", 4)==0) { - extern int32_t sv_readdiff(int32_t fil); - k=sv_readdiff(g_demo_recFilePtr); if (k) { diff --git a/polymer/eduke32/source/demo.h b/polymer/eduke32/source/demo.h index 93d5bad88..0763cb16e 100644 --- a/polymer/eduke32/source/demo.h +++ b/polymer/eduke32/source/demo.h @@ -45,8 +45,6 @@ extern int32_t g_demo_totalCnt; int32_t G_OpenDemoRead(int32_t g_whichDemo); int32_t G_PlaybackDemo(void); -int32_t sv_loadsnapshot(int32_t fil,int32_t *ret_hasdiffs,int32_t *ret_demoticcnt,int32_t *ret_synccompress); -int32_t sv_updatestate(int32_t frominit); void demo_preparewarp(void); void G_CloseDemoWrite(void); void G_DemoRecord(void); diff --git a/polymer/eduke32/source/game.h b/polymer/eduke32/source/game.h index 405f44b2c..68da89f66 100644 --- a/polymer/eduke32/source/game.h +++ b/polymer/eduke32/source/game.h @@ -326,11 +326,6 @@ extern char forcegl; #endif #endif -#if KRANDDEBUG -int32_t krd_print(const char *filename); -void krd_enable(int32_t which); -#endif - #define minitextshade(x, y, t, s, p, sb) minitext_(x,y,t,s,p,sb) #define minitext(x, y, t, p, sb) minitext_(x,y,t,0,p,sb) #define menutext(x,y,s,p,t) menutext_(x,y,s,p,(char *)OSD_StripColors(menutextbuf,t),10+16)