projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990219-1
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 2df15b7796b07d6276158268c488f5c2d1825093..253827d31d7de1b3c315585d006cc1f198588ed1 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-87,19
+87,6
@@
#define DOUBLE_PLAYER_SPEED(p) (HALVE_MOVE_DELAY((p)->move_delay_value))
#define HALVE_PLAYER_SPEED(p) (DOUBLE_MOVE_DELAY((p)->move_delay_value))
#define DOUBLE_PLAYER_SPEED(p) (HALVE_MOVE_DELAY((p)->move_delay_value))
#define HALVE_PLAYER_SPEED(p) (DOUBLE_MOVE_DELAY((p)->move_delay_value))
-/* score for elements */
-#define SC_EDELSTEIN 0
-#define SC_DIAMANT 1
-#define SC_KAEFER 2
-#define SC_FLIEGER 3
-#define SC_MAMPFER 4
-#define SC_ROBOT 5
-#define SC_PACMAN 6
-#define SC_KOKOSNUSS 7
-#define SC_DYNAMIT 8
-#define SC_SCHLUESSEL 9
-#define SC_ZEITBONUS 10
-
/* game button identifiers */
#define GAME_CTRL_ID_STOP 0
#define GAME_CTRL_ID_PAUSE 1
/* game button identifiers */
#define GAME_CTRL_ID_STOP 0
#define GAME_CTRL_ID_PAUSE 1
@@
-212,6
+199,7
@@
static void InitField(int x, int y, boolean init_game)
if (!options.network || player->connected)
{
player->active = TRUE;
if (!options.network || player->connected)
{
player->active = TRUE;
+ player->gone = FALSE;
/* remove potentially duplicate players */
if (StorePlayer[jx][jy] == Feld[x][y])
/* remove potentially duplicate players */
if (StorePlayer[jx][jy] == Feld[x][y])
@@
-397,7
+385,7
@@
void InitGame()
player->snapped = FALSE;
player->snapped = FALSE;
- player->gone =
FALS
E;
+ player->gone =
TRU
E;
player->last_jx = player->last_jy = 0;
player->jx = player->jy = 0;
player->last_jx = player->last_jy = 0;
player->jx = player->jy = 0;
@@
-484,6
+472,7
@@
void InitGame()
{
player->present = TRUE;
player->active = TRUE;
{
player->present = TRUE;
player->active = TRUE;
+ player->gone = FALSE;
some_player->present = FALSE;
StorePlayer[jx][jy] = player->element_nr;
some_player->present = FALSE;
StorePlayer[jx][jy] = player->element_nr;
@@
-508,6
+497,7
@@
void InitGame()
int jx = player->jx, jy = player->jy;
player->active = FALSE;
int jx = player->jx, jy = player->jy;
player->active = FALSE;
+ player->gone = TRUE;
StorePlayer[jx][jy] = 0;
Feld[jx][jy] = EL_LEERRAUM;
}
StorePlayer[jx][jy] = 0;
Feld[jx][jy] = EL_LEERRAUM;
}
@@
-529,6
+519,7
@@
void InitGame()
int jx = player->jx, jy = player->jy;
player->active = FALSE;
int jx = player->jx, jy = player->jy;
player->active = FALSE;
+ player->gone = TRUE;
StorePlayer[jx][jy] = 0;
Feld[jx][jy] = EL_LEERRAUM;
}
StorePlayer[jx][jy] = 0;
Feld[jx][jy] = EL_LEERRAUM;
}