X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=4514b646f2ca304e1f51546cab27cd22dcf5a6dc;hb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;hp=b9b3cd76daa65a0a9c5c341e4d9d1fb5fc1fd946;hpb=f1beb2260f7ddd444f951b3f90f733707b196686;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index b9b3cd76..4514b646 100644
--- a/src/game.c
+++ b/src/game.c
@@ -91,15 +91,6 @@
 #define SC_SCHLUESSEL		9
 #define SC_ZEITBONUS		10
 
-/* values for game_emulation */
-#define EMU_NONE		0
-#define EMU_BOULDERDASH		1
-#define EMU_SOKOBAN		2
-#define EMU_SUPAPLEX		3
-
-/* to control special behaviour of certain game elements */
-int game_emulation = EMU_NONE;
-
 
 
 
@@ -544,15 +535,40 @@ void InitGame()
 		    emulate_sb ? EMU_SOKOBAN :
 		    emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
 
-  scroll_x = scroll_y = -1;
-  if (local_player->jx >= MIDPOSX-1)
-    scroll_x = (local_player->jx <= lev_fieldx-MIDPOSX ?
+  /* determine border element for this level */
+  SetBorderElement();
+
+  if (BorderElement == EL_LEERRAUM)
+  {
+    SBX_Left = 0;
+    SBX_Right = lev_fieldx - SCR_FIELDX;
+    SBY_Upper = 0;
+    SBY_Lower = lev_fieldy - SCR_FIELDY;
+  }
+  else
+  {
+    SBX_Left = -1;
+    SBX_Right = lev_fieldx - SCR_FIELDX + 1;
+    SBY_Upper = -1;
+    SBY_Lower = lev_fieldy - SCR_FIELDY + 1;
+  }
+
+  if (lev_fieldx < SCR_FIELDX)
+    SBX_Left = SBX_Right = -1 * (SCR_FIELDX - lev_fieldx) / 2;
+
+  if (lev_fieldy < SCR_FIELDY)
+    SBY_Upper = SBY_Lower = -1 * (SCR_FIELDY - lev_fieldy) / 2;
+
+  scroll_x = SBX_Left;
+  scroll_y = SBY_Upper;
+  if (local_player->jx >= SBX_Left + MIDPOSX)
+    scroll_x = (local_player->jx <= SBX_Right + MIDPOSX ?
 		local_player->jx - MIDPOSX :
-		lev_fieldx - SCR_FIELDX + 1);
-  if (local_player->jy >= MIDPOSY-1)
-    scroll_y = (local_player->jy <= lev_fieldy-MIDPOSY ?
+		SBX_Right);
+  if (local_player->jy >= SBY_Upper + MIDPOSY)
+    scroll_y = (local_player->jy <= SBY_Lower + MIDPOSY ?
 		local_player->jy - MIDPOSY :
-		lev_fieldy - SCR_FIELDY + 1);
+		SBY_Lower);
 
   CloseDoor(DOOR_CLOSE_1);
 
@@ -591,7 +607,7 @@ void InitGame()
 	    DOOR_GFX_PAGEX1 + GAME_CONTROL_XPOS,
 	    DOOR_GFX_PAGEY1 + GAME_CONTROL_YPOS);
 
-  OpenDoor(DOOR_OPEN_1);
+  OpenDoor(DOOR_OPEN_ALL);
 
   if (setup.sound_music)
     PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
@@ -1002,7 +1018,9 @@ void DrawDynamite(int x, int y)
       phase = 7 - phase;
   }
 
-  if (Store[x][y])
+  if (game_emulation == EMU_SUPAPLEX)
+    DrawGraphic(sx, sy, GFX_SP_DISK_RED);
+  else if (Store[x][y])
     DrawGraphicThruMask(sx, sy, graphic + phase);
   else
     DrawGraphic(sx, sy, graphic + phase);
@@ -1058,7 +1076,7 @@ void Explode(int ex, int ey, int phase, int mode)
 	RemoveMovingField(x, y);
       }
 
-      if (!IN_LEV_FIELD(x, y) || IS_MASSIV(element) || element == EL_BURNING)
+      if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(element) || element == EL_BURNING)
 	continue;
 
       if ((mode!=EX_NORMAL || center_element == EL_AMOEBA2DIAM) &&
@@ -1221,7 +1239,7 @@ void DynaExplode(int ex, int ey)
       int y = ey+j*xy[i%4][1];
       int element;
 
-      if (!IN_LEV_FIELD(x, y) || IS_MASSIV(Feld[x][y]))
+      if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(Feld[x][y]))
 	break;
 
       element = Feld[x][y];
@@ -3878,13 +3896,13 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     {
       if (jx != old_jx)		/* player has moved horizontally */
       {
- 	if ((player->MovDir == MV_LEFT && scroll_x > jx-MIDPOSX+offset) ||
-	    (player->MovDir == MV_RIGHT && scroll_x < jx-MIDPOSX-offset))
+ 	if ((player->MovDir == MV_LEFT && scroll_x > jx - MIDPOSX + offset) ||
+	    (player->MovDir == MV_RIGHT && scroll_x < jx - MIDPOSX - offset))
 	  scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
 
 	/* don't scroll over playfield boundaries */
-	if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 1)
-	  scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 1);
+	if (scroll_x < SBX_Left || scroll_x > SBX_Right)
+	  scroll_x = (scroll_x < SBX_Left ? SBX_Left : SBX_Right);
 
 	/* don't scroll more than one field at a time */
 	scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
@@ -3896,13 +3914,13 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
       }
       else			/* player has moved vertically */
       {
-	if ((player->MovDir == MV_UP && scroll_y > jy-MIDPOSY+offset) ||
-	    (player->MovDir == MV_DOWN && scroll_y < jy-MIDPOSY-offset))
+	if ((player->MovDir == MV_UP && scroll_y > jy - MIDPOSY + offset) ||
+	    (player->MovDir == MV_DOWN && scroll_y < jy - MIDPOSY - offset))
 	  scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
 
 	/* don't scroll over playfield boundaries */
-	if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 1)
-	  scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 1);
+	if (scroll_y < SBY_Upper || scroll_y > SBY_Lower)
+	  scroll_y = (scroll_y < SBY_Upper ? SBY_Upper : SBY_Lower);
 
 	/* don't scroll more than one field at a time */
 	scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);
@@ -4674,7 +4692,12 @@ boolean PlaceBomb(struct PlayerInfo *player)
     DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3),
 	     FS_SMALL, FC_YELLOW);
     if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
-      DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT);
+    {
+      if (game_emulation == EMU_SUPAPLEX)
+	DrawGraphic(SCREENX(jx), SCREENY(jy), GFX_SP_DISK_RED);
+      else
+	DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT);
+    }
   }
   else
   {