X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=6bf12a6670d2a58f781810a7a1099e7ecac7713d;hb=38568f7dfac13f7a53f1d8751db2a63b64c935e8;hp=a2226a78d8228e9b5229a43618122060eb734a7b;hpb=c9308ba3e7ddea2d7e44b4d98f0dfbb19e18f04f;p=rocksndiamonds.git diff --git a/src/libgame/system.h b/src/libgame/system.h index a2226a78..6bf12a66 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -596,10 +596,15 @@ /* macros for version handling */ -#define VERSION_MAJOR(x) ((x) / 1000000) -#define VERSION_MINOR(x) (((x) % 1000000) / 10000) -#define VERSION_PATCH(x) (((x) % 10000) / 100) -#define VERSION_BUILD(x) ((x) % 100) +#define VERSION_PART_1(x) ((x) / 1000000) +#define VERSION_PART_2(x) (((x) % 1000000) / 10000) +#define VERSION_PART_3(x) (((x) % 10000) / 100) +#define VERSION_PART_4(x) ((x) % 100) + +#define VERSION_SUPER(x) VERSION_PART_1(x) +#define VERSION_MAJOR(x) VERSION_PART_2(x) +#define VERSION_MINOR(x) VERSION_PART_3(x) +#define VERSION_PATCH(x) VERSION_PART_4(x) #define VERSION_IDENT(a,b,c,d) ((a) * 1000000 + (b) * 10000 + (c) * 100 + (d)) @@ -780,10 +785,10 @@ struct ProgramInfo FILE *log_file[NUM_LOGS]; /* log file handles for out/err files */ FILE *log_file_default[NUM_LOGS]; /* default log file handles (out/err) */ + int version_super; int version_major; int version_minor; int version_patch; - int version_build; int version_ident; char *version_string; @@ -958,16 +963,21 @@ struct TileCursorInfo { boolean enabled; /* tile cursor generally enabled or disabled */ boolean active; /* tile cursor activated (depending on game) */ + boolean moving; /* tile cursor moving to target position */ int xpos, ypos; /* tile cursor level playfield position */ int x, y; /* tile cursor current screen position */ int target_x, target_y; /* tile cursor target screen position */ + + int sx, sy; /* tile cursor screen start position */ }; struct OverlayInfo { boolean enabled; /* overlay generally enabled or disabled */ boolean active; /* overlay activated (depending on game mode) */ + + boolean show_grid; }; struct JoystickInfo @@ -1450,6 +1460,7 @@ struct MouseActionInfo { int lx, ly; int button; + int button_hint; }; struct LevelStats @@ -1532,8 +1543,10 @@ void SetTileCursorEnabled(boolean); void SetTileCursorActive(boolean); void SetTileCursorTargetXY(int, int); void SetTileCursorXY(int, int); +void SetTileCursorSXSY(int, int); void SetOverlayEnabled(boolean); void SetOverlayActive(boolean); +void SetOverlayShowGrid(boolean); boolean GetOverlayActive(); void SetDrawDeactivationMask(int); int GetDrawDeactivationMask(void);