X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.h;h=c26e1a259b52f2a5acc9e1e049544137a7c57fbf;hb=fa628a204ea4662806244b0ed994a48b40ece2ca;hp=8ae104915bb26aefe87e8b4f064f0da00454b17c;hpb=49c6dea89a293093a952b991594980b469dd835a;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 8ae10491..c26e1a25 100644 --- a/src/main.h +++ b/src/main.h @@ -667,6 +667,18 @@ #define GFX_ELEMENT(e) (element_info[e].use_gfx_element ? \ element_info[e].gfx_element : e) +#if 1 +#define TILE_GFX_ELEMENT(x, y) \ + (GfxElement[x][y] != EL_UNDEFINED && \ + Feld[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Feld[x][y]) +#else +#define TILE_GFX_ELEMENT(x, y) \ + GFX_ELEMENT(GfxElement[x][y] != EL_UNDEFINED && \ + Feld[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Feld[x][y]) +#endif + /* !!! "use sound" deactivated due to problems with level "bug machine" !!! */ /* (solution: add separate "use sound of element" to level file and editor) */ #if 0 @@ -2081,8 +2093,8 @@ struct GameInfo boolean restart_level; /* values for special game control */ - int centered_to_player; - int centered_to_player_next; + int centered_player_nr; + int centered_player_nr_next; }; struct GlobalInfo