- Blood: there's no need to store the loadsave handlers in local variables that never get used.

source/blood/src/actor.cpp

@@ -6948,11 +6948,10 @@ void ActorLoadSave::Save(void)
     Write(gPost, sizeof(gPost));
 }
 
-static ActorLoadSave *myLoadSave;
 
 void ActorLoadSaveConstruct(void)
 {
-    myLoadSave = new ActorLoadSave();
+    new ActorLoadSave();
 }
 
 END_BLD_NS

source/blood/src/ai.cpp

@@ -1757,11 +1757,9 @@ void AILoadSave::Save(void)
     Write(gGenDudeExtra, sizeof(gGenDudeExtra));
 }
 
-static AILoadSave *myLoadSave;
-
 void AILoadSaveConstruct(void)
 {
-    myLoadSave = new AILoadSave();
+    new AILoadSave();
 }
 
 END_BLD_NS

source/blood/src/callback.cpp

@@ -606,7 +606,7 @@ void sub_76A08(spritetype *pSprite, spritetype *pSprite2, PLAYER *pPlayer) // ??
     }
 }
 
-void DropVoodoo(int nSprite) // unused
+void DropVoodooCb(int nSprite) // unused
 {
     spritetype *pSprite = &sprite[nSprite];
     int nOwner = actSpriteOwnerToSpriteId(pSprite);
@@ -760,7 +760,7 @@ void(*gCallback[kCallbackMax])(int) =
     fxPodBloodSpray,
     fxPodBloodSplat,
     LeechStateTimer,
-    DropVoodoo, // unused
+    DropVoodooCb, // unused
     #ifdef NOONE_EXTENSIONS
     callbackUniMissileBurst, // the code is in nnexts.cpp
     callbackMakeMissileBlocking, // the code is in nnexts.cpp

source/blood/src/endgame.cpp

@@ -289,11 +289,10 @@ void EndGameLoadSave::Save(void)
 
 CSecretMgr gSecretMgr;
 CKillMgr gKillMgr;
-static EndGameLoadSave* myLoadSave;
 
 void EndGameLoadSaveConstruct(void)
 {
-	myLoadSave = new EndGameLoadSave();
+	new EndGameLoadSave();
 }
 
 

source/blood/src/eventq.cpp

@@ -609,11 +609,10 @@ void EventQLoadSave::Save()
     Write(bucketHead, sizeof(bucketHead));
 }
 
-static EventQLoadSave *myLoadSave;
 
 void EventQLoadSaveConstruct(void)
 {
-    myLoadSave = new EventQLoadSave();
+    new EventQLoadSave();
 }
 
 END_BLD_NS

source/blood/src/levels.cpp

@@ -257,8 +257,6 @@ class LevelsLoadSave : public LoadSave
 };
 
 
-static LevelsLoadSave *myLoadSave;
-
 void LevelsLoadSave::Load(void)
 {
     Read(&gNextLevel, sizeof(gNextLevel));
@@ -273,7 +271,7 @@ void LevelsLoadSave::Save(void)
 
 void LevelsLoadSaveConstruct(void)
 {
-    myLoadSave = new LevelsLoadSave();
+    new LevelsLoadSave();
 }
 
 END_BLD_NS

source/blood/src/loadsave.cpp

@@ -736,9 +736,6 @@ void MyLoadSave::Save(void)
     Write(skyInfo, sizeof(*skyInfo));
 }
 
-static MyLoadSave *myLoadSave;
-
-
 void ActorLoadSaveConstruct(void);
 void AILoadSaveConstruct(void);
 void EndGameLoadSaveConstruct(void);
@@ -751,14 +748,13 @@ void SeqLoadSaveConstruct(void);
 void TriggersLoadSaveConstruct(void);
 void ViewLoadSaveConstruct(void);
 void WarpLoadSaveConstruct(void);
-void WeaponLoadSaveConstruct(void);
 #ifdef NOONE_EXTENSIONS
 void NNLoadSaveConstruct(void);
 #endif
 
 void LoadSaveSetup(void)
 {
-    myLoadSave = new MyLoadSave();
+    new MyLoadSave();
 
     ActorLoadSaveConstruct();
     AILoadSaveConstruct();
@@ -772,7 +768,6 @@ void LoadSaveSetup(void)
     TriggersLoadSaveConstruct();
     ViewLoadSaveConstruct();
     WarpLoadSaveConstruct();
-    WeaponLoadSaveConstruct();
 #ifdef NOONE_EXTENSIONS
     NNLoadSaveConstruct();
 #endif

source/blood/src/messages.cpp

@@ -568,11 +568,9 @@ void MessagesLoadSave::Save()
     Write(&bPlayerCheated, sizeof(bPlayerCheated));
 }
 
-static MessagesLoadSave *myLoadSave;
-
 void MessagesLoadSaveConstruct(void)
 {
-    myLoadSave = new MessagesLoadSave();
+    new MessagesLoadSave();
 }
 
 void InitCheats()

source/blood/src/mirrors.cpp

@@ -427,8 +427,6 @@ public:
     void Save(void);
 };
 
-static MirrorLoadSave *myLoadSave;
-
 void MirrorLoadSave::Load(void)
 {
 #ifdef USE_OPENGL
@@ -472,7 +470,7 @@ void MirrorLoadSave::Save(void)
 
 void MirrorLoadSaveConstruct(void)
 {
-    myLoadSave = new MirrorLoadSave();
+    new MirrorLoadSave();
 }
 
 END_BLD_NS

source/blood/src/nnexts.cpp

@@ -5284,11 +5284,9 @@ void NNLoadSave::Save(void)
 	Write(&gEventRedirectsUsed, sizeof(gEventRedirectsUsed));
 }
 
-static NNLoadSave* myLoadSave;
-
 void NNLoadSaveConstruct(void)
 {
-    myLoadSave = new NNLoadSave();
+    new NNLoadSave();
 }
 
 ///////////////////////////////////////////////////////////////////

source/blood/src/player.cpp

@@ -2210,11 +2210,9 @@ void PlayerLoadSave::Save(void)
     #endif
 }
 
-static PlayerLoadSave *myLoadSave;
-
 void PlayerLoadSaveConstruct(void)
 {
-    myLoadSave = new PlayerLoadSave();
+    new PlayerLoadSave();
 }
 
 END_BLD_NS

source/blood/src/preload.cpp

@@ -33,8 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 BEGIN_BLD_NS
 
-#define gotpic blafasl
-
 int nPrecacheCount;
 
 void fxPrecache(HitList &hits);

source/blood/src/triggers.cpp

@@ -2309,11 +2309,9 @@ void TriggersLoadSave::Save()
     Write(basePath, sizeof(basePath));
 }
 
-static TriggersLoadSave *myLoadSave;
-
 void TriggersLoadSaveConstruct(void)
 {
-    myLoadSave = new TriggersLoadSave();
+    new TriggersLoadSave();
 }
 
 END_BLD_NS

source/blood/src/view.cpp

@@ -1064,8 +1064,6 @@ public:
     void Save(void);
 };
 
-static ViewLoadSave *myLoadSave;
-
 static int messageTime;
 static char message[256];
 
@@ -1095,7 +1093,7 @@ void ViewLoadSave::Save(void)
 
 void ViewLoadSaveConstruct(void)
 {
-    myLoadSave = new ViewLoadSave();
+    new ViewLoadSave();
 }
 
 END_BLD_NS

source/blood/src/warp.cpp

@@ -323,11 +323,9 @@ void WarpLoadSave::Save()
     Write(gLowerLink, sizeof(gLowerLink));
 }
 
-static WarpLoadSave *myLoadSave;
-
 void WarpLoadSaveConstruct(void)
 {
-    myLoadSave = new WarpLoadSave();
+    new WarpLoadSave();
 }
 
 END_BLD_NS

source/blood/src/weapon.cpp

@@ -2545,26 +2545,4 @@ void sub_51340(spritetype *pMissile, int a2)
     }
 }
 
-class WeaponLoadSave : public LoadSave
-{
-public:
-    virtual void Load();
-    virtual void Save();
-};
-
-void WeaponLoadSave::Load()
-{
-}
-
-void WeaponLoadSave::Save()
-{
-}
-
-static WeaponLoadSave *myLoadSave;
-
-void WeaponLoadSaveConstruct(void)
-{
-    myLoadSave = new WeaponLoadSave();
-}
-
 END_BLD_NS