added optional button to restart game (door, panel and touch variants)

[rocksndiamonds.git] / src / game_em / reademc.c

diff --git a/src/game_em/reademc.c b/src/game_em/reademc.c
index a192b9ba2c1ca57108edaa0531fc7fecc2c4ca39..48eb9121c9dfabff3a301a53cdc7fc335d3513f5 100644 (file)
--- a/src/game_em/reademc.c
+++ b/src/game_em/reademc.c
@@ -299,8 +299,6 @@ void convert_em_level(unsigned char *src, int file_version)
   cav.time_seconds = MIN(GET_BE16(src[2110]), 9999);
   cav.gems_needed = src[2095];
 
-  cav.infinite = game_em.use_wrap_around;
-  cav.testmode = FALSE;
   cav.teamwork = (src[2150] & 128) != 0;
 
   /* scores */
@@ -314,7 +312,7 @@ void convert_em_level(unsigned char *src, int file_version)
   cav.nut_score                = src[2090];
   cav.dynamite_score   = src[2091];
   cav.key_score                = src[2092];
-  cav.exit_score       = src[2093] * 8 / 5;
+  cav.exit_score       = src[2093];
 
   cav.lenses_score     = src[2151];
   cav.magnify_score    = src[2152];
@@ -786,8 +784,7 @@ int cleanup_em_level(unsigned char *src, int length, char *filename)
   /* size of v6 cave */
   length = 2172;
 
-  if (options.debug)
-    Debug("level:native:EM", "EM level file version: %d", file_version);
+  Debug("level:native:EM", "EM level file version: %d", file_version);
 
   return file_version;
 }
@@ -804,7 +801,7 @@ if(len >= 2110 && (buf[2106] == 255 && buf[2107] == 53 && buf[2108] == 48 && buf
 if(len >= 2106 && (buf[1983] == 116 || buf[2047] == 116)) // v4
 if(len >= 2106 && (buf[1983] == 27 || buf[2047] == 219)) // v3
 
-buf[0]=241;buf[1]=248;for(i=0,j=101;i<2106;i++,j+=7)buf[i]=(buf[i]^j)-17; // decrypt
+buf[0] = 241; buf[1] = 248; for(i = 0, j = 101; i < 2106; i++, j += 7) buf[i] = (buf[i] ^ j) - 17; // decrypt
 
 number of movements (calls to logic) = time * 50 / 8