diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index e4a8854d4..85485e1ae 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -150,8 +150,6 @@ char **g_clipMapFiles = NULL; int32_t g_clipMapFilesNum = 0; #endif -extern int32_t lastvisinc; - int32_t g_Shareware = 0; #define MAXUSERQUOTES 6 @@ -7810,7 +7808,6 @@ skip: if (t->picnum == EXPLOSION2) { g_player[screenpeek].ps->visibility = -127; - lastvisinc = totalclock+32; //g_restorePalette = 1; // JBF 20040101: why? } t->shade = -127; diff --git a/polymer/eduke32/source/game.h b/polymer/eduke32/source/game.h index 336e12e3d..f5e64c68f 100644 --- a/polymer/eduke32/source/game.h +++ b/polymer/eduke32/source/game.h @@ -280,7 +280,6 @@ extern int32_t g_restorePalette; extern int32_t g_usingAddon; extern int32_t hud_glowingquotes; extern int32_t hud_showmapname; -extern int32_t lastvisinc; extern int32_t rts_numlumps; extern int32_t quotebot; extern int32_t quotebotgoal; diff --git a/polymer/eduke32/source/gamedef.h b/polymer/eduke32/source/gamedef.h index 4cefd5e06..3a639d868 100644 --- a/polymer/eduke32/source/gamedef.h +++ b/polymer/eduke32/source/gamedef.h @@ -60,7 +60,6 @@ extern intptr_t *apScriptGameEvent[MAXGAMEEVENTS]; #endif extern int32_t otherp; -extern int32_t lastvisinc; extern char CheatStrings[][MAXCHEATLEN]; extern char g_szScriptFileName[BMAX_PATH]; extern int32_t g_totalLines,g_lineNumber; diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 54550444c..66b061698 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -3499,7 +3499,6 @@ nullquote: insptr++; sprite[vm.g_i].shade = -127; g_player[vm.g_p].ps->visibility = -127; - lastvisinc = totalclock+32; continue; case CON_SAVEMAPSTATE: diff --git a/polymer/eduke32/source/gamevars.c b/polymer/eduke32/source/gamevars.c index 6b760189c..d75247263 100644 --- a/polymer/eduke32/source/gamevars.c +++ b/polymer/eduke32/source/gamevars.c @@ -1270,6 +1270,10 @@ void Gv_FinalizeWeaponDefaults(void) #undef FINISH_WEAPON_DEFAULT_X #undef POSTADDWEAPONVAR +#if !defined LUNATIC +static int32_t lastvisinc; +#endif + static void Gv_AddSystemVars(void) { // only call ONCE diff --git a/polymer/eduke32/source/lunatic/control.lua b/polymer/eduke32/source/lunatic/control.lua index 460c2b907..7161b94fe 100644 --- a/polymer/eduke32/source/lunatic/control.lua +++ b/polymer/eduke32/source/lunatic/control.lua @@ -1634,8 +1634,7 @@ end function _flash(spr, ps) spr.shade = -127 - ps.visibility = -127 -- XXX - ffiC.lastvisinc = ffiC.totalclock+32 + ps.visibility = -127 -- NOTE: negative value not a problem anymore end function _G_OperateRespawns(tag) diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua index 72ffeb3e4..cc9e5cf04 100644 --- a/polymer/eduke32/source/lunatic/defs.ilua +++ b/polymer/eduke32/source/lunatic/defs.ilua @@ -634,7 +634,6 @@ struct char *ScriptQuotes[]; const int32_t playerswhenstarted; -int32_t lastvisinc; int16_t g_spriteDeleteQueueSize; int16_t BlimpSpawnSprites[15]; int32_t g_scriptVersion; diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist index 29d8f3fdf..a05ef1210 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist +++ b/polymer/eduke32/source/lunatic/dynsymlist @@ -155,7 +155,6 @@ ScriptQuotes; screenpeek; hudweap; playerswhenstarted; -lastvisinc; g_spriteDeleteQueueSize; BlimpSpawnSprites; g_scriptVersion; diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c index 6f798281b..7024d4235 100644 --- a/polymer/eduke32/source/player.c +++ b/polymer/eduke32/source/player.c @@ -1971,7 +1971,6 @@ static void P_FireWeapon(DukePlayer_t *p) s->x -= x; s->y -= y; #endif // POLYMER - lastvisinc = totalclock+32; p->visibility = 0; } } diff --git a/polymer/eduke32/source/player.h b/polymer/eduke32/source/player.h index c39a399cd..e0a2df0b9 100644 --- a/polymer/eduke32/source/player.h +++ b/polymer/eduke32/source/player.h @@ -324,8 +324,6 @@ typedef struct { extern input_t inputfifo[MOVEFIFOSIZ][MAXPLAYERS]; extern playerspawn_t g_playerSpawnPoints[MAXPLAYERS]; extern playerdata_t g_player[MAXPLAYERS]; -//extern char dashow2dsector[(MAXSECTORS+7)>>3]; -//extern int16_t searchsect[MAXSECTORS],searchparent[MAXSECTORS]; extern int16_t WeaponPickupSprites[MAX_WEAPONS]; extern hudweapon_t hudweap; extern int32_t g_levelTextTime; @@ -333,7 +331,6 @@ extern int32_t g_myAimMode; extern int32_t g_numObituaries; extern int32_t g_numSelfObituaries; extern int32_t g_emuJumpTics; -extern int32_t lastvisinc; extern int32_t mouseyaxismode; extern int32_t ticrandomseed;