projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c1d625
)
renamed some functions
author
Holger Schemel
<info@artsoft.org>
Fri, 11 Sep 2020 09:42:31 +0000
(11:42 +0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 11 Sep 2020 09:42:31 +0000
(11:42 +0200)
src/game.c
patch
|
blob
|
history
diff --git
a/src/game.c
b/src/game.c
index ea44ebd1b295e0fbd134a548d6f12fd0d56b0cc9..5bf2c6a47488c989818e6c7e1f2d30c545249942 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-1092,8
+1092,8
@@
static void FadeLevelSoundsAndMusic(void);
static void HandleGameButtons(struct GadgetInfo *);
static void HandleGameButtons(struct GadgetInfo *);
-int Amoeb
eNachba
rNr(int, int);
-void Amoeb
eUmwandeln
(int, int);
+int Amoeb
aNeighbou
rNr(int, int);
+void Amoeb
aToDiamond
(int, int);
void ContinueMoving(int, int);
void Bang(int, int);
void InitMovDir(int, int);
void ContinueMoving(int, int);
void Bang(int, int);
void InitMovDir(int, int);
@@
-4599,7
+4599,7
@@
void InitMovDir(int x, int y)
void InitAmoebaNr(int x, int y)
{
int i;
void InitAmoebaNr(int x, int y)
{
int i;
- int group_nr = Amoeb
eNachba
rNr(x, y);
+ int group_nr = Amoeb
aNeighbou
rNr(x, y);
if (group_nr == 0)
{
if (group_nr == 0)
{
@@
-5769,7
+5769,7
@@
static void Explode(int ex, int ey, int phase, int mode)
}
else if (border_element == EL_AMOEBA_TO_DIAMOND)
{
}
else if (border_element == EL_AMOEBA_TO_DIAMOND)
{
- Amoeb
eUmwandeln
(x, y);
+ Amoeb
aToDiamond
(x, y);
Store2[x][y] = 0;
border_explosion = TRUE;
}
Store2[x][y] = 0;
border_explosion = TRUE;
}
@@
-8690,7
+8690,7
@@
void ContinueMoving(int x, int y)
MV_DIR_OPPOSITE(direction));
}
MV_DIR_OPPOSITE(direction));
}
-int Amoeb
eNachba
rNr(int ax, int ay)
+int Amoeb
aNeighbou
rNr(int ax, int ay)
{
int i;
int element = Feld[ax][ay];
{
int i;
int element = Feld[ax][ay];
@@
-8718,7
+8718,7
@@
int AmoebeNachbarNr(int ax, int ay)
return group_nr;
}
return group_nr;
}
-static void Amoeb
enVereinigen
(int ax, int ay)
+static void Amoeb
aMerge
(int ax, int ay)
{
int i, x, y, xx, yy;
int new_group_nr = AmoebaNr[ax][ay];
{
int i, x, y, xx, yy;
int new_group_nr = AmoebaNr[ax][ay];
@@
-8765,7
+8765,7
@@
static void AmoebenVereinigen(int ax, int ay)
}
}
}
}
-void Amoeb
eUmwandeln
(int ax, int ay)
+void Amoeb
aToDiamond
(int ax, int ay)
{
int i, x, y;
{
int i, x, y;
@@
-8776,8
+8776,8
@@
void AmoebeUmwandeln(int ax, int ay)
#ifdef DEBUG
if (group_nr == 0)
{
#ifdef DEBUG
if (group_nr == 0)
{
- printf("Amoeb
eUmwandeln
(): ax = %d, ay = %d\n", ax, ay);
- printf("Amoeb
eUmwandeln
(): This should never happen!\n");
+ printf("Amoeb
aToDiamond
(): ax = %d, ay = %d\n", ax, ay);
+ printf("Amoeb
aToDiamond
(): This should never happen!\n");
return;
}
#endif
return;
}
#endif
@@
-8825,7
+8825,7
@@
void AmoebeUmwandeln(int ax, int ay)
}
}
}
}
-static void Amoeb
eUmwandeln
BD(int ax, int ay, int new_element)
+static void Amoeb
aToDiamond
BD(int ax, int ay, int new_element)
{
int x, y;
int group_nr = AmoebaNr[ax][ay];
{
int x, y;
int group_nr = AmoebaNr[ax][ay];
@@
-8834,8
+8834,8
@@
static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
#ifdef DEBUG
if (group_nr == 0)
{
#ifdef DEBUG
if (group_nr == 0)
{
- printf("Amoeb
eUmwandeln
BD(): ax = %d, ay = %d\n", ax, ay);
- printf("Amoeb
eUmwandeln
BD(): This should never happen!\n");
+ printf("Amoeb
aToDiamond
BD(): ax = %d, ay = %d\n", ax, ay);
+ printf("Amoeb
aToDiamond
BD(): This should never happen!\n");
return;
}
#endif
return;
}
#endif
@@
-8861,7
+8861,7
@@
static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
SND_BD_AMOEBA_TURNING_TO_GEM));
}
SND_BD_AMOEBA_TURNING_TO_GEM));
}
-static void Amoeb
eWaechst
(int x, int y)
+static void Amoeb
aGrowing
(int x, int y)
{
static unsigned int sound_delay = 0;
static unsigned int sound_delay_value = 0;
{
static unsigned int sound_delay = 0;
static unsigned int sound_delay_value = 0;
@@
-8897,7
+8897,7
@@
static void AmoebeWaechst(int x, int y)
}
}
}
}
-static void Amoeba
Disappear
ing(int x, int y)
+static void Amoeba
Shrink
ing(int x, int y)
{
static unsigned int sound_delay = 0;
static unsigned int sound_delay_value = 0;
{
static unsigned int sound_delay = 0;
static unsigned int sound_delay_value = 0;
@@
-8933,7
+8933,7
@@
static void AmoebaDisappearing(int x, int y)
}
}
}
}
-static void Amoeb
eAbleger
(int ax, int ay)
+static void Amoeb
aReproduce
(int ax, int ay)
{
int i;
int element = Feld[ax][ay];
{
int i;
int element = Feld[ax][ay];
@@
-9027,9
+9027,9
@@
static void AmoebeAbleger(int ax, int ay)
if (AmoebaCnt[AmoebaNr[ax][ay]] <= 0) // amoeba is completely dead
{
if (element == EL_AMOEBA_FULL)
if (AmoebaCnt[AmoebaNr[ax][ay]] <= 0) // amoeba is completely dead
{
if (element == EL_AMOEBA_FULL)
- Amoeb
eUmwandeln
(ax, ay);
+ Amoeb
aToDiamond
(ax, ay);
else if (element == EL_BD_AMOEBA)
else if (element == EL_BD_AMOEBA)
- Amoeb
eUmwandeln
BD(ax, ay, level.amoeba_content);
+ Amoeb
aToDiamond
BD(ax, ay, level.amoeba_content);
}
}
return;
}
}
return;
@@
-9043,8
+9043,8
@@
static void AmoebeAbleger(int ax, int ay)
#ifdef DEBUG
if (new_group_nr == 0)
{
#ifdef DEBUG
if (new_group_nr == 0)
{
- printf("Amoeb
eAbleger
(): newax = %d, neway = %d\n", newax, neway);
- printf("Amoeb
eAbleger
(): This should never happen!\n");
+ printf("Amoeb
aReproduce
(): newax = %d, neway = %d\n", newax, neway);
+ printf("Amoeb
aReproduce
(): This should never happen!\n");
return;
}
#endif
return;
}
#endif
@@
-9054,11
+9054,11
@@
static void AmoebeAbleger(int ax, int ay)
AmoebaCnt2[new_group_nr]++;
// if amoeba touches other amoeba(s) after growing, unify them
AmoebaCnt2[new_group_nr]++;
// if amoeba touches other amoeba(s) after growing, unify them
- Amoeb
enVereinigen
(newax, neway);
+ Amoeb
aMerge
(newax, neway);
if (element == EL_BD_AMOEBA && AmoebaCnt2[new_group_nr] >= 200)
{
if (element == EL_BD_AMOEBA && AmoebaCnt2[new_group_nr] >= 200)
{
- Amoeb
eUmwandeln
BD(newax, neway, EL_BD_ROCK);
+ Amoeb
aToDiamond
BD(newax, neway, EL_BD_ROCK);
return;
}
}
return;
}
}
@@
-12100,13
+12100,13
@@
void GameActions_RND(void)
else if (IS_ACTIVE_BOMB(element))
CheckDynamite(x, y);
else if (element == EL_AMOEBA_GROWING)
else if (IS_ACTIVE_BOMB(element))
CheckDynamite(x, y);
else if (element == EL_AMOEBA_GROWING)
- Amoeb
eWaechst
(x, y);
+ Amoeb
aGrowing
(x, y);
else if (element == EL_AMOEBA_SHRINKING)
else if (element == EL_AMOEBA_SHRINKING)
- Amoeba
Disappear
ing(x, y);
+ Amoeba
Shrink
ing(x, y);
#if !USE_NEW_AMOEBA_CODE
else if (IS_AMOEBALIVE(element))
#if !USE_NEW_AMOEBA_CODE
else if (IS_AMOEBALIVE(element))
- Amoeb
eAbleger
(x, y);
+ Amoeb
aReproduce
(x, y);
#endif
else if (element == EL_GAME_OF_LIFE || element == EL_BIOMAZE)
#endif
else if (element == EL_GAME_OF_LIFE || element == EL_BIOMAZE)