X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FGlobals.c;h=a73a6ffd68f3a1241dd693029cfc9985768afb05;hb=da0b032a906bd0fdadf798802c04c9084bee074c;hp=9ddbf2b0d3cc1787f9253ace9d4866a9e89f0602;hpb=61c3da024802ecc0268bab42d7499fc0346e4fd3;p=rocksndiamonds.git

diff --git a/src/game_sp/Globals.c b/src/game_sp/Globals.c
index 9ddbf2b0..a73a6ffd 100644
--- a/src/game_sp/Globals.c
+++ b/src/game_sp/Globals.c
@@ -14,28 +14,13 @@ int FieldWidth;		// standard size = 60
 int FieldHeight;	// standard size = 24
 int HeaderSize;		// standard size = 96
 int FieldMax, LevelMax;
-#if 0
-int FileMax;
-#endif
 
-#if 1
 int *PlayField16;
 byte *PlayField8;
-// int PlayField16[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
-// byte PlayField8[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
 byte DisPlayField[SP_MAX_PLAYFIELD_SIZE + SP_HEADER_SIZE];
-#else
-int *PlayField16;
-byte *PlayField8;
-byte *DisPlayField;
-#endif
 
 int TimerVar;
-#if 1
 short RandomSeed;
-#else
-int RandomSeed;
-#endif
 
 int FreezeZonks;
 
@@ -166,7 +151,7 @@ boolean isSnappingSequence(int sequence)
   }
 }
 
-void InitGlobals()
+void InitGlobals(void)
 {
   InitPrecedingPlayfieldMemory();
 
@@ -181,28 +166,17 @@ void InitGlobals()
   bPlaying = False;
   menBorder = False;
 
-  /* add preceding playfield buffer (as large as preceding memory area) */
+  // add preceding playfield buffer (as large as preceding memory area)
   PlayField16 = checked_calloc((game_sp.preceding_buffer_size +
 				SP_MAX_PLAYFIELD_SIZE +
 				SP_HEADER_SIZE) * sizeof(int));
   PlayField16 = &PlayField16[game_sp.preceding_buffer_size];
 
-  /* add preceding playfield buffer (as large as one playfield row) */
+  // add preceding playfield buffer (as large as one playfield row)
   PlayField8 = checked_calloc((SP_MAX_PLAYFIELD_WIDTH +
 			       SP_MAX_PLAYFIELD_SIZE +
 			       SP_HEADER_SIZE) * sizeof(byte));
   PlayField8 = &PlayField8[SP_MAX_PLAYFIELD_WIDTH];
-
-#if 0
-  /* these defaults will be changed after reading a Supaplex level file */
-  PlayField8 = REDIM_1D(sizeof(byte), 0, FieldMax);
-  DisPlayField = REDIM_1D(sizeof(byte), 0, FieldMax);
-  PlayField16 = REDIM_1D(sizeof(int), 0, FieldMax);
-
-  AnimationPosTable = REDIM_1D(sizeof(int), 0, LevelMax);
-  AnimationSubTable = REDIM_1D(sizeof(byte), 0, LevelMax);
-  TerminalState = REDIM_1D(sizeof(byte), 0, FieldMax);
-#endif
 }
 
 int GetSI(int X, int Y)
@@ -230,30 +204,16 @@ int GetStretchY(int si)
   return StretchWidth * (si / FieldWidth);
 }
 
-void PrepareLevel()
+void PrepareLevel(void)
 {
   copyInternalEngineVars_SP();
 
-#if 1
   SetDisplayRegion();
   SetScrollEdges();
-#endif
 
   LevelLoaded = True;
 }
 
-#if 0
-void Trace(char *Source, char *Message)
-{
-  printf("::: Trace: Source == '%s', Message == '%s'\n", Source, Message);
-}
-
-void ReportError(char *Source, char *Message)
-{
-  printf("::: ReportError: Source == '%s', Message == '%s'\n", Source, Message);
-}
-#endif
-
 int Min(int A, int B)
 {
   return (A < B ? A : B);