X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Finput.c;h=3738b38ba271d4d07cc1216dc479b28d0b9a7e03;hb=0b7d45708c8b008d0ca7a11490a2267f9c314cdb;hp=b2c79ac7f79e475cb4f34214bd0e897f4d6a0c62;hpb=c138430b14041bf340d371fd3cd27e727c4c50c1;p=rocksndiamonds.git

diff --git a/src/game_em/input.c b/src/game_em/input.c
index b2c79ac7..3738b38b 100644
--- a/src/game_em/input.c
+++ b/src/game_em/input.c
@@ -16,8 +16,8 @@ short **Cave;
 short **Next;
 short **Draw;
 
-static short *Index[4][HEIGHT];
-static short Array[4][HEIGHT][WIDTH];
+static short *Index[4][WIDTH];
+static short Array[4][WIDTH][HEIGHT];
 
 extern int screen_x;
 extern int screen_y;
@@ -32,25 +32,25 @@ void game_init_vars(void)
 
   for (y = 0; y < HEIGHT; y++)
     for (x = 0; x < WIDTH; x++)
-      Array[0][y][x] = ZBORDER;
+      Array[0][x][y] = Zborder;
   for (y = 0; y < HEIGHT; y++)
     for (x = 0; x < WIDTH; x++)
-      Array[1][y][x] = ZBORDER;
+      Array[1][x][y] = Zborder;
   for (y = 0; y < HEIGHT; y++)
     for (x = 0; x < WIDTH; x++)
-      Array[2][y][x] = ZBORDER;
+      Array[2][x][y] = Zborder;
   for (y = 0; y < HEIGHT; y++)
     for (x = 0; x < WIDTH; x++)
-      Array[3][y][x] = Xblank;
+      Array[3][x][y] = Xblank;
 
-  for (y = 0; y < HEIGHT; y++)
-    Index[0][y] = Array[0][y];
-  for (y = 0; y < HEIGHT; y++)
-    Index[1][y] = Array[1][y];
-  for (y = 0; y < HEIGHT; y++)
-    Index[2][y] = Array[2][y];
-  for (y = 0; y < HEIGHT; y++)
-    Index[3][y] = Array[3][y];
+  for (x = 0; x < WIDTH; x++)
+    Index[0][x] = Array[0][x];
+  for (x = 0; x < WIDTH; x++)
+    Index[1][x] = Array[1][x];
+  for (x = 0; x < WIDTH; x++)
+    Index[2][x] = Array[2][x];
+  for (x = 0; x < WIDTH; x++)
+    Index[3][x] = Array[3][x];
 
   Cave = Index[0];
   Next = Index[1];
@@ -58,7 +58,7 @@ void game_init_vars(void)
   Boom = Index[3];
 }
 
-void InitGameEngine_EM()
+void InitGameEngine_EM(void)
 {
   prepare_em_level();
 
@@ -67,7 +67,7 @@ void InitGameEngine_EM()
   RedrawPlayfield_EM(FALSE);
 }
 
-void UpdateGameDoorValues_EM()
+static void UpdateGameDoorValues_EM(void)
 {
 }
 
@@ -87,14 +87,13 @@ void GameActions_EM(byte action[MAX_PLAYERS], boolean warp_mode)
 
   if (frame == 7)
   {
-    synchro_1();
-    synchro_2();
+    logic_1();
+    logic_2();
   }
 
   if (frame == 6)
   {
-    synchro_3();
-    sound_play();
+    logic_3();
 
     UpdateGameDoorValues_EM();
   }
@@ -119,6 +118,9 @@ void readjoy(byte action, struct PLAYER *ply)
   int north = 0, east = 0, south = 0, west = 0;
   int snap = 0, drop = 0;
 
+  if (game_em.use_single_button && action & (JOY_BUTTON_1 | JOY_BUTTON_2))
+    action |= JOY_BUTTON_1 | JOY_BUTTON_2;
+
   if (action & JOY_LEFT)
     west = 1;
 
@@ -158,9 +160,13 @@ void readjoy(byte action, struct PLAYER *ply)
       !ply->joy_s &&
       !ply->joy_w)
     ply->joy_snap = snap;
+
+  /* use bug with snap key (mainly TAS keys) sometimes moving the player */
+  if (game_em.use_snap_key_bug)
+    ply->joy_snap = snap;
 }
 
-void SaveEngineSnapshotValues_EM()
+void SaveEngineSnapshotValues_EM(void)
 {
   int i, j, k;
 
@@ -184,10 +190,10 @@ void SaveEngineSnapshotValues_EM()
   for (i = 0; i < 4; i++)
     for (j = 0; j < HEIGHT; j++)
       for (k = 0; k < WIDTH; k++)
-	engine_snapshot_em.Array[i][j][k] = Array[i][j][k];
+	engine_snapshot_em.Array[i][k][j] = Array[i][k][j];
 }
 
-void LoadEngineSnapshotValues_EM()
+void LoadEngineSnapshotValues_EM(void)
 {
   int i, j, k;
 
@@ -211,5 +217,5 @@ void LoadEngineSnapshotValues_EM()
   for (i = 0; i < 4; i++)
     for (j = 0; j < HEIGHT; j++)
       for (k = 0; k < WIDTH; k++)
-	Array[i][j][k] = engine_snapshot_em.Array[i][j][k];
+	Array[i][k][j] = engine_snapshot_em.Array[i][k][j];
 }