projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e1e2f90
)
minor code formatting changes
author
Holger Schemel
<info@artsoft.org>
Sun, 19 Jan 2020 01:23:36 +0000
(
02:23
+0100)
committer
Holger Schemel
<info@artsoft.org>
Tue, 19 May 2020 16:12:55 +0000
(18:12 +0200)
src/game_em/emerald.h
patch
|
blob
|
history
diff --git
a/src/game_em/emerald.h
b/src/game_em/emerald.h
index 55f90e4705f3ba1d4d053ac15c6476d8a4e67f80..e16fcae480c3b6451abe77856b57056481098461 100644
(file)
--- a/
src/game_em/emerald.h
+++ b/
src/game_em/emerald.h
@@
-81,6
+81,7
@@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
enum
{
Xblank = 0,
enum
{
Xblank = 0,
+
Xacid_splash_e,
Xacid_splash_w,
Xacid_splash_e,
Xacid_splash_w,
@@
-108,6
+109,7
@@
enum
Ystone_eB,
Ystone_w,
Ystone_wB,
Ystone_eB,
Ystone_w,
Ystone_wB,
+
Xnut,
Xnut_pause,
Xnut_fall,
Xnut,
Xnut_pause,
Xnut_fall,
@@
-117,6
+119,7
@@
enum
Ynut_eB,
Ynut_w,
Ynut_wB,
Ynut_eB,
Ynut_w,
Ynut_wB,
+
Xbug_1_n,
Xbug_1_e,
Xbug_1_s,
Xbug_1_n,
Xbug_1_e,
Xbug_1_s,
@@
-143,6
+146,7
@@
enum
Ybug_n_w,
Ybug_stone,
Ybug_spring,
Ybug_n_w,
Ybug_stone,
Ybug_spring,
+
Xtank_1_n,
Xtank_1_e,
Xtank_1_s,
Xtank_1_n,
Xtank_1_e,
Xtank_1_s,
@@
-169,6
+173,7
@@
enum
Ytank_n_w,
Ytank_stone,
Ytank_spring,
Ytank_n_w,
Ytank_stone,
Ytank_spring,
+
Xandroid,
Xandroid_1_n,
Xandroid_2_n,
Xandroid,
Xandroid_1_n,
Xandroid_2_n,
@@
-194,6
+199,7
@@
enum
Yandroid_wB,
Yandroid_nw,
Yandroid_nwB,
Yandroid_wB,
Yandroid_nw,
Yandroid_nwB,
+
Xspring,
Xspring_pause,
Xspring_e,
Xspring,
Xspring_pause,
Xspring_e,
@@
-209,6
+215,7
@@
enum
Yspring_alien_eB,
Yspring_alien_w,
Yspring_alien_wB,
Yspring_alien_eB,
Yspring_alien_w,
Yspring_alien_wB,
+
Xeater_n,
Xeater_e,
Xeater_w,
Xeater_n,
Xeater_e,
Xeater_w,
@@
-223,6
+230,7
@@
enum
Yeater_wB,
Yeater_stone,
Yeater_spring,
Yeater_wB,
Yeater_stone,
Yeater_spring,
+
Xalien,
Xalien_pause,
Yalien_n,
Xalien,
Xalien_pause,
Yalien_n,
@@
-235,6
+243,7
@@
enum
Yalien_wB,
Yalien_stone,
Yalien_spring,
Yalien_wB,
Yalien_stone,
Yalien_spring,
+
Xemerald,
Xemerald_pause,
Xemerald_fall,
Xemerald,
Xemerald_pause,
Xemerald_fall,
@@
-247,6
+256,7
@@
enum
Yemerald_wB,
Yemerald_blank,
Ynut_stone,
Yemerald_wB,
Yemerald_blank,
Ynut_stone,
+
Xdiamond,
Xdiamond_pause,
Xdiamond_fall,
Xdiamond,
Xdiamond_pause,
Xdiamond_fall,
@@
-259,6
+269,7
@@
enum
Ydiamond_wB,
Ydiamond_blank,
Ydiamond_stone,
Ydiamond_wB,
Ydiamond_blank,
Ydiamond_stone,
+
Xdrip_fall,
Xdrip_stretch,
Xdrip_stretchB,
Xdrip_fall,
Xdrip_stretch,
Xdrip_stretchB,
@@
-267,6
+278,7
@@
enum
Ydrip_1_sB,
Ydrip_2_s,
Ydrip_2_sB,
Ydrip_1_sB,
Ydrip_2_s,
Ydrip_2_sB,
+
Xbomb,
Xbomb_pause,
Xbomb_fall,
Xbomb,
Xbomb_pause,
Xbomb_fall,
@@
-277,6
+289,7
@@
enum
Ybomb_w,
Ybomb_wB,
Ybomb_blank,
Ybomb_w,
Ybomb_wB,
Ybomb_blank,
+
Xballoon,
Yballoon_n,
Yballoon_nB,
Xballoon,
Yballoon_n,
Yballoon_nB,
@@
-286,16
+299,19
@@
enum
Yballoon_sB,
Yballoon_w,
Yballoon_wB,
Yballoon_sB,
Yballoon_w,
Yballoon_wB,
+
Xgrass,
Ygrass_nB,
Ygrass_eB,
Ygrass_sB,
Ygrass_wB,
Xgrass,
Ygrass_nB,
Ygrass_eB,
Ygrass_sB,
Ygrass_wB,
+
Xdirt,
Ydirt_nB,
Ydirt_eB,
Ydirt_sB,
Ydirt_wB,
Xdirt,
Ydirt_nB,
Ydirt_eB,
Ydirt_sB,
Ydirt_wB,
+
Xacid_ne,
Xacid_se,
Xacid_s,
Xacid_ne,
Xacid_se,
Xacid_s,
@@
-309,6
+325,7
@@
enum
Xacid_6,
Xacid_7,
Xacid_8,
Xacid_6,
Xacid_7,
Xacid_8,
+
Xball_1,
Yball_1,
Xball_2,
Xball_1,
Yball_1,
Xball_2,
@@
-334,8
+351,10
@@
enum
Yslidewall_ns_blank,
Xslidewall_ew,
Yslidewall_ew_blank,
Yslidewall_ns_blank,
Xslidewall_ew,
Yslidewall_ew_blank,
+
Xwonderwall,
XwonderwallB,
Xwonderwall,
XwonderwallB,
+
Xamoeba_1,
Xamoeba_2,
Xamoeba_3,
Xamoeba_1,
Xamoeba_2,
Xamoeba_3,
@@
-344,6
+363,7
@@
enum
Xamoeba_6,
Xamoeba_7,
Xamoeba_8,
Xamoeba_6,
Xamoeba_7,
Xamoeba_8,
+
Xdoor_1,
Xdoor_2,
Xdoor_3,
Xdoor_1,
Xdoor_2,
Xdoor_3,
@@
-352,6
+372,7
@@
enum
Xdoor_6,
Xdoor_7,
Xdoor_8,
Xdoor_6,
Xdoor_7,
Xdoor_8,
+
Xkey_1,
Xkey_2,
Xkey_3,
Xkey_1,
Xkey_2,
Xkey_3,
@@
-360,28
+381,35
@@
enum
Xkey_6,
Xkey_7,
Xkey_8,
Xkey_6,
Xkey_7,
Xkey_8,
+
Xwind_n,
Xwind_e,
Xwind_s,
Xwind_w,
Xwind_any,
Xwind_stop,
Xwind_n,
Xwind_e,
Xwind_s,
Xwind_w,
Xwind_any,
Xwind_stop,
+
Xexit,
Xexit_1,
Xexit_2,
Xexit_3,
Xexit,
Xexit_1,
Xexit_2,
Xexit_3,
+
Xdynamite,
Ydynamite_blank,
Xdynamite_1,
Xdynamite_2,
Xdynamite_3,
Xdynamite_4,
Xdynamite,
Ydynamite_blank,
Xdynamite_1,
Xdynamite_2,
Xdynamite_3,
Xdynamite_4,
+
Xbumper,
XbumperB,
Xbumper,
XbumperB,
+
Xwheel,
XwheelB,
Xwheel,
XwheelB,
+
Xswitch,
XswitchB,
Xswitch,
XswitchB,
+
Xsand,
Xsand_stone,
Xsand_stonein_1,
Xsand,
Xsand_stone,
Xsand_stonein_1,
@@
-404,16
+432,23
@@
enum
Xsand_sandstone_2,
Xsand_sandstone_3,
Xsand_sandstone_4,
Xsand_sandstone_2,
Xsand_sandstone_3,
Xsand_sandstone_4,
+
Xplant,
Yplant,
Xplant,
Yplant,
+
Xlenses,
Xlenses,
+
Xmagnify,
Xmagnify,
+
Xfake_amoeba, /* dripper */
Xfake_amoebaB,
Xfake_amoeba, /* dripper */
Xfake_amoebaB,
+
Xfake_blank,
Xfake_blankB,
Xfake_blank,
Xfake_blankB,
+
Xfake_grass,
Xfake_grassB,
Xfake_grass,
Xfake_grassB,
+
Xfake_door_1,
Xfake_door_2,
Xfake_door_3,
Xfake_door_1,
Xfake_door_2,
Xfake_door_3,
@@
-438,14
+473,17
@@
enum
Xsteel_2,
Xsteel_3,
Xsteel_4,
Xsteel_2,
Xsteel_3,
Xsteel_4,
+
Xwall_1,
Xwall_2,
Xwall_3,
Xwall_4,
Xwall_1,
Xwall_2,
Xwall_3,
Xwall_4,
+
Xroundwall_1,
Xroundwall_2,
Xroundwall_3,
Xroundwall_4,
Xroundwall_1,
Xroundwall_2,
Xroundwall_3,
Xroundwall_4,
+
Xdecor_1,
Xdecor_2,
Xdecor_3,
Xdecor_1,
Xdecor_2,
Xdecor_3,
@@
-458,6
+496,7
@@
enum
Xdecor_10,
Xdecor_11,
Xdecor_12,
Xdecor_10,
Xdecor_11,
Xdecor_12,
+
Xalpha_0,
Xalpha_1,
Xalpha_2,
Xalpha_0,
Xalpha_1,
Xalpha_2,
@@
-532,14
+571,17
@@
enum
enum
{
PLY_still = 0,
enum
{
PLY_still = 0,
+
PLY_walk_n,
PLY_walk_e,
PLY_walk_s,
PLY_walk_w,
PLY_walk_n,
PLY_walk_e,
PLY_walk_s,
PLY_walk_w,
+
PLY_push_n,
PLY_push_e,
PLY_push_s,
PLY_push_w,
PLY_push_n,
PLY_push_e,
PLY_push_s,
PLY_push_w,
+
PLY_shoot_n,
PLY_shoot_e,
PLY_shoot_s,
PLY_shoot_n,
PLY_shoot_e,
PLY_shoot_s,