removed some unused stuff from MM engine code

diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c
index 1e859b196d2e3540108ac8e33f4057ff6852fb18..a1c9151d7274de14efdc66b6f8368c1ef58f7e66 100644 (file)
--- a/src/game_mm/mm_game.c
+++ b/src/game_mm/mm_game.c
@@ -660,10 +660,6 @@ void InitGameEngine_MM(void)
     }
   }
 
     }
   }
 

-#if 0
-  CloseDoor(DOOR_CLOSE_1);
-#endif
-

   DrawLevel_MM();
 }
 
   DrawLevel_MM();
 }
 


@@ -675,36 +671,6 @@ void InitGameActions_MM(void)
 
   InitLaser();
 
 
   InitLaser();
 

-#if 0
-  // copy default game door content to main double buffer
-  BlitBitmap(pix[PIX_DOOR], drawto,
-            DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
-#endif
-
-#if 0
-  DrawText(DX_LEVEL, DY_LEVEL,
-          int2str(level_nr, 2), FONT_TEXT_2);
-  DrawText(DX_KETTLES, DY_KETTLES,
-          int2str(game_mm.kettles_still_needed, 3), FONT_TEXT_2);
-  DrawText(DX_SCORE, DY_SCORE,
-          int2str(game_mm.score, 4), FONT_TEXT_2);
-#endif
-
-#if 0
-  UnmapGameButtons();
-  MapGameButtons();
-#endif
-
-#if 0
-  // copy actual game door content to door double buffer for OpenDoor()
-  BlitBitmap(drawto, pix[PIX_DB_DOOR],
-            DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-#endif
-
-#if 0
-  OpenDoor(DOOR_OPEN_ALL);
-#endif
-

   for (i = 0; i <= num_init_game_frames; i++)
   {
     if (i == num_init_game_frames)
   for (i = 0; i <= num_init_game_frames; i++)
   {
     if (i == num_init_game_frames)


@@ -735,11 +701,6 @@ void InitGameActions_MM(void)
 #endif
   }
 
 #endif
   }
 

-#if 0
-  if (setup.sound_music && num_bg_loops)
-    PlayMusic(level_nr % num_bg_loops);
-#endif
-

   ScanLaser();
 
   if (game_mm.kettles_still_needed == 0)
   ScanLaser();
 
   if (game_mm.kettles_still_needed == 0)


@@ -3148,12 +3109,6 @@ static void GameActions_MM_Ext(struct MouseActionInfo action, boolean warp_mode)
     {
       game_mm.energy_left--;
 
     {
       game_mm.energy_left--;
 

-#if 0
-      BlitBitmap(pix[PIX_DOOR], drawto,
-                DOOR_GFX_PAGEX5 + XX_ENERGY, DOOR_GFX_PAGEY1 + YY_ENERGY,
-                ENERGY_XSIZE, ENERGY_YSIZE - game_mm.energy_left,
-                DX_ENERGY, DY_ENERGY);
-#endif

       redraw_mask |= REDRAW_DOOR_1;
     }
     else if (setup.time_limit && !game_mm.game_over)
       redraw_mask |= REDRAW_DOOR_1;
     }
     else if (setup.time_limit && !game_mm.game_over)


@@ -3260,9 +3215,6 @@ static void GameActions_MM_Ext(struct MouseActionInfo action, boolean warp_mode)
                        (native_mm_level.laser_blue  ? color_down : 0x00));
 
       DrawLaser(0, DL_LASER_ENABLED);
                        (native_mm_level.laser_blue  ? color_down : 0x00));
 
       DrawLaser(0, DL_LASER_ENABLED);

-#if 0
-      BackToFront();
-#endif

     }
 
     if (!laser.overloaded)
     }
 
     if (!laser.overloaded)


@@ -3959,10 +3911,6 @@ void GameWon_MM(void)
       StopSound(SND_SIRR);
   }
 
       StopSound(SND_SIRR);
   }
 

-#if 0
-  FadeSounds();
-#endif
-

   CloseDoor(DOOR_CLOSE_1);
 
   Request("Level solved!", REQ_CONFIRM);
   CloseDoor(DOOR_CLOSE_1);
 
   Request("Level solved!", REQ_CONFIRM);


@@ -4198,11 +4146,6 @@ void PlaySoundLevel(int x, int y, int sound_nr)
 static void RaiseScore_MM(int value)
 {
   game_mm.score += value;
 static void RaiseScore_MM(int value)
 {
   game_mm.score += value;

-
-#if 0
-  DrawText(DX_SCORE, DY_SCORE, int2str(game_mm.score, 4),
-          FONT_TEXT_2);
-#endif

 }
 
 void RaiseScoreElement_MM(int element)
 }
 
 void RaiseScoreElement_MM(int element)

diff --git a/src/game_mm/mm_game.h b/src/game_mm/mm_game.h
index f8db06bb2ddbc4b222b767d5ba88983340997c23..8dd12afe4a6c79cc169d215a6144b88a17e534ae 100644 (file)
--- a/src/game_mm/mm_game.h
+++ b/src/game_mm/mm_game.h
@@ -15,53 +15,13 @@
 #include "main_mm.h"
 
 
 #include "main_mm.h"
 
 

-void InitAmoebaNr(int, int);

 void GameWon_MM(void);
 int NewHiScore_MM(void);
 
 void GameWon_MM(void);
 int NewHiScore_MM(void);
 

-void Blurb(int, int);
-void Impact(int, int);

 void TurnRound(int, int);
 void TurnRound(int, int);

-int AmoebeNachbarNr(int, int);
-void AmoebeUmwandeln(int, int);
-void AmoebeUmwandelnBD(int, int, int);
-void AmoebeWaechst(int, int);
-void AmoebeAbleger(int, int);
-void Life(int, int);
-void Ablenk(int, int);
-void Blubber(int, int);
-void NussKnacken(int, int);
-void SiebAktivieren(int, int, int);
-void AusgangstuerPruefen(int, int);
-void AusgangstuerOeffnen(int, int);
-void AusgangstuerBlinken(int, int);
-void EdelsteinFunkeln(int, int);
-void MauerWaechst(int, int);
-void MauerAbleger(int, int);

 
 

-boolean MoveFigureOneStep(struct PlayerInfo *, int, int, int, int);
-boolean MoveFigure(struct PlayerInfo *, int, int);
-void ScrollFigure(struct PlayerInfo *, int);
-void ScrollScreen(struct PlayerInfo *, int);
-
-void TestIfGoodThingHitsBadThing(int, int);
-void TestIfBadThingHitsGoodThing(int, int);
-void TestIfHeroHitsBadThing(int, int);
-void TestIfBadThingHitsHero(int, int);
-void TestIfFriendHitsBadThing(int, int);
-void TestIfBadThingHitsFriend(int, int);
-void TestIfBadThingHitsOtherBadThing(int, int);
-void KillHero(struct PlayerInfo *);
-void BuryHero(struct PlayerInfo *);
-void RemoveHero(struct PlayerInfo *);
-int DigField(struct PlayerInfo *, int, int, int, int, int);
-boolean SnapField(struct PlayerInfo *, int, int);
-boolean PlaceBomb(struct PlayerInfo *);

 void PlaySoundLevel(int, int, int);
 
 void PlaySoundLevel(int, int, int);
 

-void CreateGameButtons(void);
-void UnmapGameButtons(void);
-

 void AddLaserEdge(int, int);
 void AddDamagedField(int, int);
 void ScanLaser(void);
 void AddLaserEdge(int, int);
 void AddDamagedField(int, int);
 void ScanLaser(void);

diff --git a/src/game_mm/mm_main.h b/src/game_mm/mm_main.h
index 946afd1aa0254dad4cb6d59d2937c5be9c0e4177..9f8e04727ccb2bdaaab0e36f18f30c8497b05a3d 100644 (file)
--- a/src/game_mm/mm_main.h
+++ b/src/game_mm/mm_main.h
@@ -186,21 +186,10 @@ struct HiScore_MM
   int Score;
 };
 
   int Score;
 };
 

-extern Bitmap         *pix[];
-extern DrawBuffer      *fieldbuffer;

 extern DrawBuffer      *drawto_field;
 
 extern DrawBuffer      *drawto_field;
 

-extern int             joystick_device;
-extern char           *joystick_device_name[];
-

 extern int             game_status;
 extern boolean         level_editor_test_game;
 extern int             game_status;
 extern boolean         level_editor_test_game;

-extern boolean         network_playing;
-
-extern int             key_joystick_mapping;
-extern int             global_joystick_status, joystick_status;
-extern int             sound_status;
-extern boolean         sound_loops_allowed;

 
 extern boolean         redraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int             redraw_x1, redraw_y1;
 
 extern boolean         redraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern int             redraw_x1, redraw_y1;


@@ -219,7 +208,6 @@ extern short                Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean         Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern boolean         Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];

-extern short           JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];

 extern short           AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
 extern unsigned int    Elementeigenschaften[MAX_ELEMENTS];
 extern short           AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 extern short           AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
 extern unsigned int    Elementeigenschaften[MAX_ELEMENTS];


@@ -235,8 +223,6 @@ extern int          BX1, BY1, BX2, BY2;
 extern int             SBX_Left, SBX_Right;
 extern int             SBY_Upper, SBY_Lower;
 extern int             TimeFrames, TimePlayed, TimeLeft;
 extern int             SBX_Left, SBX_Right;
 extern int             SBY_Upper, SBY_Lower;
 extern int             TimeFrames, TimePlayed, TimeLeft;

-extern boolean         SiebAktiv;
-extern int             SiebCount;

 
 extern struct LevelInfo_MM     native_mm_level;
 extern struct HiScore_MM       highscore[];
 
 extern struct LevelInfo_MM     native_mm_level;
 extern struct HiScore_MM       highscore[];


@@ -260,9 +246,6 @@ extern int          color_status;
 extern struct XY       Step[];
 extern short           Sign[16];
 
 extern struct XY       Step[];
 extern short           Sign[16];
 

-extern char           *sound_name[];
-extern int             background_loop[];
-extern int             num_bg_loops;

 extern char           *element_info[];
 extern int             num_element_info;
 
 extern char           *element_info[];
 extern int             num_element_info;
 

diff --git a/src/game_mm/mm_tools.h b/src/game_mm/mm_tools.h
index 45d42f69e0eba59380c462136578f90335c2259b..3d958de50cc3daab1318d0103afe89ec6886edd2 100644 (file)
--- a/src/game_mm/mm_tools.h
+++ b/src/game_mm/mm_tools.h
@@ -48,13 +48,6 @@
 #define REQ_STAY_CLOSED                (1 << 4)
 #define REQ_STAY_OPEN          (1 << 5)
 
 #define REQ_STAY_CLOSED                (1 << 4)
 #define REQ_STAY_OPEN          (1 << 5)
 

-#define REQUEST_WAIT_FOR       (REQ_ASK | REQ_CONFIRM)
-
-// font types
-#define FS_SMALL               0
-#define FS_BIG                 1
-#define FS_MEDIUM              2
-

 
 void SetDrawtoField_MM(int);
 void BackToFront(void);
 
 void SetDrawtoField_MM(int);
 void BackToFront(void);