From 60fa7d9f00505bae51499c1b366c40993ec80495 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Sun, 25 Dec 2011 15:30:50 +0000 Subject: [PATCH] Remove a few unused variables from global.[ch], update build date string. git-svn-id: https://svn.eduke32.com/eduke32@2196 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/defs.c | 2 +- polymer/eduke32/source/global.c | 12 +----------- polymer/eduke32/source/global.h | 4 ---- polymer/eduke32/source/mapster32.h | 3 --- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/polymer/eduke32/build/src/defs.c b/polymer/eduke32/build/src/defs.c index 7648015fb..f3637edf3 100644 --- a/polymer/eduke32/build/src/defs.c +++ b/polymer/eduke32/build/src/defs.c @@ -105,7 +105,7 @@ static int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens) } static int32_t lastmodelid = -1, lastvoxid = -1, modelskin = -1, lastmodelskin = -1, seenframe = 0; -extern int32_t nextvoxid; +int32_t nextvoxid = 0; #ifdef USE_OPENGL extern float alphahackarray[MAXTILES]; diff --git a/polymer/eduke32/source/global.c b/polymer/eduke32/source/global.c index 41e82d445..7c43cfdbe 100644 --- a/polymer/eduke32/source/global.c +++ b/polymer/eduke32/source/global.c @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "duke3d.h" #include "rev.h" -const char *s_buildDate = "20110319"; +const char *s_buildDate = "20111222"; char *MusicPtr = NULL; int32_t g_musicSize; @@ -36,7 +36,6 @@ int32_t neartaghitdist,lockclock,g_startArmorAmount; // JBF: g_spriteGravity modified to default to Atomic ed. default when using 1.3d CONs int32_t g_spriteGravity=176; -// int32_t temp_data[MAXSPRITES][6]; actor_t actor[MAXSPRITES]; int16_t SpriteDeletionQueue[1024],g_spriteDeleteQueuePos,g_spriteDeleteQueueSize=64; @@ -44,7 +43,6 @@ animwalltype animwall[MAXANIMWALLS]; int16_t g_numAnimWalls; int32_t *animateptr[MAXANIMATES]; int32_t animategoal[MAXANIMATES], animatevel[MAXANIMATES], g_animateCount; -// int32_t oanimateval[MAXANIMATES]; int16_t animatesect[MAXANIMATES]; int32_t msx[2048],msy[2048]; int16_t cyclers[MAXCYCLERS][6],g_numCyclers; @@ -82,7 +80,6 @@ int32_t g_currentFrameRate; char g_numVolumes = 3; int32_t g_timerTicsPerSecond=TICRATE; -//fx_device device; char g_numPlayerSprites,g_loadFromGroupOnly=0,g_earthquakeTime; @@ -102,13 +99,10 @@ input_t loc; input_t recsync[RECSYNCBUFSIZ]; input_t avg; -int32_t movefifosendplc; - //Multiplayer syncing variables int32_t screenpeek; //Game recording variables - char ready2send; int32_t vel, svel, angvel, horiz, ototalclock, g_actorRespawnTime=768, g_itemRespawnTime=768, g_groupFileHandle; @@ -157,11 +151,9 @@ int16_t myhoriz, omyhoriz, myhorizoff, omyhorizoff; int16_t myang, omyang, mycursectnum, myjumpingcounter; char myjumpingtoggle, myonground, myhardlanding, myreturntocenter; -int8_t multiwho, multipos, multiwhat, multiflag; int32_t g_playerFriction = 0xcc00, g_showShareware; -int16_t myangbak[MOVEFIFOSIZ]; char szPlayerName[32]; int32_t g_damageCameras,g_freezerSelfDamage=0,g_tripbombLaserMode=0; int32_t g_gameQuit = 0; @@ -178,8 +170,6 @@ int32_t oldipos[MAXINTERPOLATIONS]; int32_t bakipos[MAXINTERPOLATIONS]; int32_t *curipos[MAXINTERPOLATIONS]; -int32_t nextvoxid = 0; - int32_t SpriteFlags[MAXTILES]; projectile_t ProjectileData[MAXTILES], DefaultProjectileData[MAXTILES], SpriteProjectile[MAXSPRITES]; diff --git a/polymer/eduke32/source/global.h b/polymer/eduke32/source/global.h index f5e2aa948..5d381df1d 100644 --- a/polymer/eduke32/source/global.h +++ b/polymer/eduke32/source/global.h @@ -78,7 +78,6 @@ G_EXTERN int16_t g_mirrorWall[64],g_mirrorSector[64],g_mirrorCount; G_EXTERN int16_t g_numAnimWalls; G_EXTERN int16_t g_numClouds,clouds[128],cloudx[128],cloudy[128]; G_EXTERN int16_t myang,omyang,mycursectnum,myjumpingcounter; -G_EXTERN int16_t myangbak[MOVEFIFOSIZ]; G_EXTERN int16_t myhoriz,omyhoriz,myhorizoff,omyhorizoff; G_EXTERN int16_t neartagsector,neartagwall,neartagsprite; G_EXTERN int32_t *animateptr[MAXANIMATES]; @@ -111,16 +110,13 @@ G_EXTERN int32_t g_showShareware; G_EXTERN int32_t g_spriteGravity; G_EXTERN int32_t g_timerTicsPerSecond; G_EXTERN int32_t g_tripbombLaserMode; -G_EXTERN int32_t movefifosendplc; G_EXTERN int32_t msx[2048],msy[2048]; G_EXTERN int32_t neartaghitdist,lockclock,g_startArmorAmount; -G_EXTERN int32_t nextvoxid; G_EXTERN int32_t oldipos[MAXINTERPOLATIONS]; G_EXTERN int32_t playerswhenstarted; G_EXTERN int32_t screenpeek; G_EXTERN int32_t startofdynamicinterpolations; G_EXTERN int32_t vel,svel,angvel,horiz,ototalclock,g_actorRespawnTime; -G_EXTERN int8_t multiwho,multipos,multiwhat,multiflag; G_EXTERN intptr_t *actorscrptr[MAXTILES],*g_parsingActorPtr; G_EXTERN intptr_t *g_scriptPtr,*insptr; G_EXTERN int32_t *labelcode,*labeltype; diff --git a/polymer/eduke32/source/mapster32.h b/polymer/eduke32/source/mapster32.h index d2275c21f..d8be0abe8 100644 --- a/polymer/eduke32/source/mapster32.h +++ b/polymer/eduke32/source/mapster32.h @@ -39,9 +39,6 @@ uint8_t default_buildkeys[NUMBUILDKEYS] = 0x9c,0x1c,0xd,0xc,0xf,0x29 }; -// needed by build/src/defs.c -int32_t nextvoxid = 0; - extern int32_t whitecol; extern char changechar(char dachar, int32_t dadir, char smooshyalign, char boundcheck); extern void updatenumsprites(void);