X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=93100c54dccdb800c35aee7ae161a5c4b653fe62;hb=38c26472a6e9f0f037ddfe535d3919c00772b26f;hp=204f7c415ffb040f13fa2ab0ce41d8e0515bb3ab;hpb=a2f9307de12b6111ff7076fed2e4140619f1ac5d;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 204f7c41..93100c54 100644 --- a/src/main.h +++ b/src/main.h @@ -693,53 +693,54 @@ /* "real" (and therefore drawable) runtime elements */ #define EL_FIRST_RUNTIME_REAL NUM_FILE_ELEMENTS -#define EL_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 0) -#define EL_BD_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 1) -#define EL_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 2) -#define EL_BD_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 3) -#define EL_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 4) -#define EL_BD_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 5) -#define EL_EXIT_OPENING (EL_FIRST_RUNTIME_REAL + 6) -#define EL_SP_TERMINAL_ACTIVE (EL_FIRST_RUNTIME_REAL + 7) -#define EL_SP_BUGGY_BASE_ACTIVE (EL_FIRST_RUNTIME_REAL + 8) -#define EL_EM_KEY1 (EL_FIRST_RUNTIME_REAL + 9) -#define EL_EM_KEY2 (EL_FIRST_RUNTIME_REAL + 10) -#define EL_EM_KEY3 (EL_FIRST_RUNTIME_REAL + 11) -#define EL_EM_KEY4 (EL_FIRST_RUNTIME_REAL + 12) -#define EL_DYNABOMB_PLAYER1_ACTIVE (EL_FIRST_RUNTIME_REAL + 13) -#define EL_DYNABOMB_PLAYER2_ACTIVE (EL_FIRST_RUNTIME_REAL + 14) -#define EL_DYNABOMB_PLAYER3_ACTIVE (EL_FIRST_RUNTIME_REAL + 15) -#define EL_DYNABOMB_PLAYER4_ACTIVE (EL_FIRST_RUNTIME_REAL + 16) -#define EL_SWITCHGATE_OPENING (EL_FIRST_RUNTIME_REAL + 17) -#define EL_SWITCHGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 18) -#define EL_TIMEGATE_OPENING (EL_FIRST_RUNTIME_REAL + 19) -#define EL_TIMEGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 20) -#define EL_PEARL_BREAKING (EL_FIRST_RUNTIME_REAL + 21) -#define EL_TRAP_ACTIVE (EL_FIRST_RUNTIME_REAL + 22) -#define EL_SP_MURPHY_CLONE (EL_FIRST_RUNTIME_REAL + 23) -#define EL_QUICKSAND_EMPTYING (EL_FIRST_RUNTIME_REAL + 24) -#define EL_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 25) -#define EL_BD_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 26) -#define EL_AMOEBA_DRIPPING (EL_FIRST_RUNTIME_REAL + 27) -#define EL_SP_EXIT_OPEN (EL_FIRST_RUNTIME_REAL + 28) -#define EL_INVISIBLE_STEELWALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 29) -#define EL_INVISIBLE_SAND_ACTIVE (EL_FIRST_RUNTIME_REAL + 30) -#define EL_INVISIBLE_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 31) -#define EL_CONVEYOR_BELT1_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 32) -#define EL_CONVEYOR_BELT1_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 33) -#define EL_CONVEYOR_BELT1_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 34) -#define EL_CONVEYOR_BELT2_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 35) -#define EL_CONVEYOR_BELT2_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 36) -#define EL_CONVEYOR_BELT2_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 37) -#define EL_CONVEYOR_BELT3_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 38) -#define EL_CONVEYOR_BELT3_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 39) -#define EL_CONVEYOR_BELT3_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 40) -#define EL_CONVEYOR_BELT4_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 41) -#define EL_CONVEYOR_BELT4_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 42) -#define EL_CONVEYOR_BELT4_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 43) +#define EL_EM_KEY1 (EL_FIRST_RUNTIME_REAL + 0) +#define EL_EM_KEY2 (EL_FIRST_RUNTIME_REAL + 1) +#define EL_EM_KEY3 (EL_FIRST_RUNTIME_REAL + 2) +#define EL_EM_KEY4 (EL_FIRST_RUNTIME_REAL + 3) +#define EL_DYNABOMB_PLAYER1_ACTIVE (EL_FIRST_RUNTIME_REAL + 4) +#define EL_DYNABOMB_PLAYER2_ACTIVE (EL_FIRST_RUNTIME_REAL + 5) +#define EL_DYNABOMB_PLAYER3_ACTIVE (EL_FIRST_RUNTIME_REAL + 6) +#define EL_DYNABOMB_PLAYER4_ACTIVE (EL_FIRST_RUNTIME_REAL + 7) +#define EL_SWITCHGATE_OPENING (EL_FIRST_RUNTIME_REAL + 8) +#define EL_SWITCHGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 9) +#define EL_TIMEGATE_OPENING (EL_FIRST_RUNTIME_REAL + 10) +#define EL_TIMEGATE_CLOSING (EL_FIRST_RUNTIME_REAL + 11) +#define EL_PEARL_BREAKING (EL_FIRST_RUNTIME_REAL + 12) +#define EL_TRAP_ACTIVE (EL_FIRST_RUNTIME_REAL + 13) +#define EL_INVISIBLE_STEELWALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 14) +#define EL_INVISIBLE_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 15) +#define EL_INVISIBLE_SAND_ACTIVE (EL_FIRST_RUNTIME_REAL + 16) +#define EL_CONVEYOR_BELT1_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 17) +#define EL_CONVEYOR_BELT1_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 18) +#define EL_CONVEYOR_BELT1_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 19) +#define EL_CONVEYOR_BELT2_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 20) +#define EL_CONVEYOR_BELT2_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 21) +#define EL_CONVEYOR_BELT2_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 22) +#define EL_CONVEYOR_BELT3_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 23) +#define EL_CONVEYOR_BELT3_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 24) +#define EL_CONVEYOR_BELT3_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 25) +#define EL_CONVEYOR_BELT4_LEFT_ACTIVE (EL_FIRST_RUNTIME_REAL + 26) +#define EL_CONVEYOR_BELT4_MIDDLE_ACTIVE (EL_FIRST_RUNTIME_REAL + 27) +#define EL_CONVEYOR_BELT4_RIGHT_ACTIVE (EL_FIRST_RUNTIME_REAL + 28) +#define EL_EXIT_OPENING (EL_FIRST_RUNTIME_REAL + 29) +#define EL_SP_EXIT_OPEN (EL_FIRST_RUNTIME_REAL + 30) +#define EL_SP_TERMINAL_ACTIVE (EL_FIRST_RUNTIME_REAL + 31) +#define EL_SP_BUGGY_BASE_ACTIVATING (EL_FIRST_RUNTIME_REAL + 32) +#define EL_SP_BUGGY_BASE_ACTIVE (EL_FIRST_RUNTIME_REAL + 33) +#define EL_SP_MURPHY_CLONE (EL_FIRST_RUNTIME_REAL + 34) +#define EL_AMOEBA_DRIPPING (EL_FIRST_RUNTIME_REAL + 35) +#define EL_QUICKSAND_EMPTYING (EL_FIRST_RUNTIME_REAL + 36) +#define EL_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 37) +#define EL_BD_MAGIC_WALL_ACTIVE (EL_FIRST_RUNTIME_REAL + 38) +#define EL_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 39) +#define EL_BD_MAGIC_WALL_FULL (EL_FIRST_RUNTIME_REAL + 40) +#define EL_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 41) +#define EL_BD_MAGIC_WALL_EMPTYING (EL_FIRST_RUNTIME_REAL + 42) +#define EL_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 43) +#define EL_BD_MAGIC_WALL_DEAD (EL_FIRST_RUNTIME_REAL + 44) /* "unreal" (and therefore not drawable) runtime elements */ -#define EL_FIRST_RUNTIME_UNREAL (EL_FIRST_RUNTIME_REAL + 44) +#define EL_FIRST_RUNTIME_UNREAL (EL_FIRST_RUNTIME_REAL + 45) #define EL_BLOCKED (EL_FIRST_RUNTIME_UNREAL + 0) #define EL_EXPLOSION (EL_FIRST_RUNTIME_UNREAL + 1) @@ -1407,10 +1408,11 @@ #define GFX_ARG_MODE_LINEAR 10 #define GFX_ARG_MODE_PINGPONG 11 #define GFX_ARG_MODE_PINGPONG2 12 -#define GFX_ARG_MODE_REVERSE 13 -#define GFX_ARG_GLOBAL_SYNC 14 +#define GFX_ARG_MODE_RANDOM 13 +#define GFX_ARG_MODE_REVERSE 14 +#define GFX_ARG_GLOBAL_SYNC 15 -#define NUM_GFX_ARGS 15 +#define NUM_GFX_ARGS 16 #define GFX_ARG_UNDEFINED "-1000000" #define GFX_ARG_UNDEFINED_VALUE (atoi(GFX_ARG_UNDEFINED)) @@ -1434,7 +1436,7 @@ #define PROGRAM_VERSION_MAJOR 2 #define PROGRAM_VERSION_MINOR 2 #define PROGRAM_VERSION_PATCH 0 -#define PROGRAM_VERSION_STRING "2.2.0rc2" +#define PROGRAM_VERSION_STRING "2.2.0rc3" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel"