X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=b4c3834cfdee63584c79c422157e440f0754a5f3;hb=3cf6686708e1beac2444181feab16cd88f20fad7;hp=8e5a427ce45b3014710ea987c46d4180ce8385c1;hpb=0d2143d53f76e2780260996fae2b9f3ce4f29913;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 8e5a427c..b4c3834c 100644 --- a/src/main.h +++ b/src/main.h @@ -298,6 +298,14 @@ struct PlayerInfo byte effective_action; /* action aknowledged from network server or summarized over all configured input devices when in single player mode */ + byte programmed_action; /* action forced by game itself (like moving + through doors); overrides other actions */ + + +#if 0 + byte programmed_speed; /* speed (for only one move) forced by game */ +#endif + int joystick_fd; /* file descriptor of player's joystick */ @@ -1055,7 +1063,9 @@ extern char *element_info[]; /* graphics from "RocksMore" */ #define GFX_SP_EMPTY (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 0) +/* #define GFX_SP_ZONK (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 1) +*/ #define GFX_SP_BASE (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 2) #define GFX_SP_MURPHY (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 3) #define GFX_SP_INFOTRON (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 4) @@ -1097,6 +1107,7 @@ extern char *element_info[]; #define GFX_INVISIBLE_STEEL (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 3) #define GFX_UNSICHTBAR (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 7) +#define GFX_SP_ZONK (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 0) #define GFX_MURPHY_GO_LEFT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 8) #define GFX_MURPHY_ANY_LEFT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 9) @@ -1273,7 +1284,7 @@ extern char *element_info[]; #define TAPES_DIRECTORY "tapes" #define SCORES_DIRECTORY "scores" -#define PROGRAM_VERSION_STRING "1.2.1" +#define PROGRAM_VERSION_STRING "1.3.0" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" #define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING