projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b31a77
)
rnd-19980928-3
author
Holger Schemel
<info@artsoft.org>
Mon, 28 Sep 1998 14:51:45 +0000
(16:51 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:30:47 +0000
(10:30 +0200)
src/events.c
patch
|
blob
|
history
src/game.c
patch
|
blob
|
history
diff --git
a/src/events.c
b/src/events.c
index 48638bdeea8cd7f31bc409e9df7f81f7a91f3626..771efb2837ca6958db89dd8f5c25140e43ae52d4 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-673,7
+673,9
@@
void HandleKey(KeySym key, int key_status)
{
char *color[] = { "yellow", "red", "green", "blue" };
{
char *color[] = { "yellow", "red", "green", "blue" };
- TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+ do
+ TestPlayer = (TestPlayer + 1) % MAX_PLAYERS;
+ while(!stored_player[TestPlayer].active);
printf("TestPlayer = %d (%s player)\n",
TestPlayer, color[TestPlayer]);
printf("TestPlayer = %d (%s player)\n",
TestPlayer, color[TestPlayer]);
diff --git
a/src/game.c
b/src/game.c
index b785616403af98b17add1109e1b1cf49ac448726..8e6c8a9c115e4d2c089d860701903a315f807af0 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-114,7
+114,11
@@
void InitGame()
/* TEST TEST TEST */
/* TEST TEST TEST */
+
+ /*
stored_player[i].active = TRUE;
stored_player[i].active = TRUE;
+ */
+
/* TEST TEST TEST */
player->LevelSolved = FALSE;
/* TEST TEST TEST */
player->LevelSolved = FALSE;
@@
-171,6
+175,8
@@
void InitGame()
if (StorePlayer[jx][jy] == Feld[x][y])
StorePlayer[jx][jy] = 0;
if (StorePlayer[jx][jy] == Feld[x][y])
StorePlayer[jx][jy] = 0;
+ player->active = TRUE;
+
StorePlayer[x][y] = Feld[x][y];
Feld[x][y] = EL_LEERRAUM;
player->jx = player->last_jx = x;
StorePlayer[x][y] = Feld[x][y];
Feld[x][y] = EL_LEERRAUM;
player->jx = player->last_jx = x;
@@
-2798,7
+2804,7
@@
void GameActions(int player_action)
{
/* TEST TEST TEST */
{
/* TEST TEST TEST */
- if (i != TestPlayer)
+ if (i != TestPlayer
&& !stored_player[i].MovPos
)
continue;
/* TEST TEST TEST */
continue;
/* TEST TEST TEST */