projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060308-1-src
[rocksndiamonds.git]
/
src
/
game_em
/
convert.c
diff --git
a/src/game_em/convert.c
b/src/game_em/convert.c
index 7b3b036aa1c7b9ad6daf4abf3d975aedb962037b..9b888ffce11733dff5f6825af16a24491971ee77 100644
(file)
--- a/
src/game_em/convert.c
+++ b/
src/game_em/convert.c
@@
-548,7
+548,7
@@
void convert_em_level(unsigned char *src, int file_version)
{
0x800, 0x809, 0x812, 0x81B, 0x840, 0x849, 0x852, 0x85B
};
{
0x800, 0x809, 0x812, 0x81B, 0x840, 0x849, 0x852, 0x85B
};
-
unsigned
int i, x, y, temp;
+ int i, x, y, temp;
#if 1
lev.time_seconds = src[0x83E] << 8 | src[0x83F];
#if 1
lev.time_seconds = src[0x83E] << 8 | src[0x83F];
@@
-901,8
+901,9
@@
void convert_em_level(unsigned char *src, int file_version)
void prepare_em_level(void)
{
void prepare_em_level(void)
{
-
unsigned
int i, x, y;
+ int i, x, y;
int players_left;
int players_left;
+ int num_tape_players;
/* reset all runtime variables to their initial values */
/* reset all runtime variables to their initial values */
@@
-969,7
+970,11
@@
void prepare_em_level(void)
}
}
}
}
- if (!setup.team_mode)
+ num_tape_players = getActivePlayers_EM();
+
+ if (num_tape_players != -1)
+ lev.home_initial = MIN(lev.home_initial, num_tape_players);
+ else if (!setup.team_mode)
lev.home_initial = MIN(lev.home_initial, 1);
lev.home = lev.home_initial;
lev.home_initial = MIN(lev.home_initial, 1);
lev.home = lev.home_initial;
@@
-986,7
+991,12
@@
void prepare_em_level(void)
}
else
{
}
else
{
- native_em_level.cave[ply[i].x_initial][ply[i].y_initial] = Xblank;
+ int x = ply[i].x_initial;
+ int y = ply[i].y_initial;
+
+ native_em_level.cave[x][y] = Xblank;
+
+ Cave[y][x] = Next[y][x] = Draw[y][x] = Xblank;
}
}
}
}
}
}
@@
-1011,4
+1021,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;
}
}