projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060319-2-src
[rocksndiamonds.git]
/
src
/
game_em
/
convert.c
diff --git
a/src/game_em/convert.c
b/src/game_em/convert.c
index 2935a10123be7a50c10443820dd03d93960f52ea..281cd25bfec5527ba9701d61fcca6ea549fab45b 100644
(file)
--- a/
src/game_em/convert.c
+++ b/
src/game_em/convert.c
@@
-8,9
+8,7
@@
* inconsequential, but no doubt it will break some caves.
*/
* inconsequential, but no doubt it will break some caves.
*/
-#include "global.h"
-#include "tile.h"
-#include "level.h"
+#include "main_em.h"
static unsigned char remap_v6[256] =
static unsigned char remap_v6[256] =
@@
-151,7
+149,7
@@
int cleanup_em_level(unsigned char *src, int length)
for (i = 2112; i < 2148; i++) src[i] = src[i - 64];
}
else if (length >= 2106 &&
for (i = 2112; i < 2148; i++) src[i] = src[i - 64];
}
else if (length >= 2106 &&
- src[0] == 241 &&
+ src[0] == 241 &&
/* <-- Emerald Mine I levels */
src[1983] == 27)
{
unsigned char j = 94;
src[1983] == 27)
{
unsigned char j = 94;
@@
-171,7
+169,7
@@
int cleanup_em_level(unsigned char *src, int length)
}
#if 1
else if (length >= 2106 &&
}
#if 1
else if (length >= 2106 &&
- src[0] == 245 &&
+ src[0] == 245 &&
/* <-- Emerald Mine II levels */
src[1983] == 27)
{
unsigned char j = 94;
src[1983] == 27)
{
unsigned char j = 94;
@@
-188,6
+186,11
@@
int cleanup_em_level(unsigned char *src, int length)
src[i] = remap_v4eater[src[i] >= 28 ? 0 : src[i]];
for (i = 2112; i < 2148; i++)
src[i] = src[i - 64];
src[i] = remap_v4eater[src[i] >= 28 ? 0 : src[i]];
for (i = 2112; i < 2148; i++)
src[i] = src[i - 64];
+
+ /* fix copyright sign in Emerald Mine II levels */
+ for (i = 0; i < 2048; i++)
+ if (src[i] == 241)
+ src[i] = 254; /* replace 'Xdecor_1' with 'Xalpha_copyr' */
}
#endif
else
}
#endif
else
@@
-538,7
+541,7
@@
static unsigned short remap_emerald[256] =
Xblank, Xblank, Xblank, Xblank,
#else
/* special elements added to solve compatibility problems */
Xblank, Xblank, Xblank, Xblank,
#else
/* special elements added to solve compatibility problems */
- Xblank, Xblank, X
blank,
Xfake_acid_1
+ Xblank, Xblank, X
alpha_copyr,
Xfake_acid_1
#endif
};
#endif
};
@@
-970,7
+973,7
@@
void prepare_em_level(void)
}
}
}
}
- num_tape_players = getActivePlayers_EM();
+ num_tape_players = get
Num
ActivePlayers_EM();
if (num_tape_players != -1)
lev.home_initial = MIN(lev.home_initial, num_tape_players);
if (num_tape_players != -1)
lev.home_initial = MIN(lev.home_initial, num_tape_players);
@@
-1021,4
+1024,10
@@
void prepare_em_level(void)
i, ply[i].x_initial, ply[i].y_initial, ply[i].alive);
#endif
}
i, ply[i].x_initial, ply[i].y_initial, ply[i].alive);
#endif
}
+
+ game_em.any_player_moving = FALSE;
+ game_em.last_moving_player = 0; /* default: first player */
+
+ for (i = 0; i < MAX_PLAYERS; i++)
+ game_em.last_player_direction[i] = MV_NONE;
}
}