diff --git a/src/mapdef/mapdef.txt b/src/mapdef/mapdef.txt
index afa87222a21dd5c5312a1f45f26f2be0cc0c435b..91453e0f7128fa452c7c08bc0f6aeb0c3cbc8eac 100644 (file)
--- a/src/mapdef/mapdef.txt
+++ b/src/mapdef/mapdef.txt
EFFECT_FIRE, // 3
}
EFFECT_FIRE, // 3
}
+//WARNING! max allowed items types is 127
enum Item {
ITEM_NONE, // 0
ITEM_MEDKIT_SMALL, // 1
enum Item {
ITEM_NONE, // 0
ITEM_MEDKIT_SMALL, // 1
TRIGGER_SHOT_BFG, // 12
TRIGGER_SHOT_EXPL, // 13
TRIGGER_SHOT_BFGEXPL, // 14
TRIGGER_SHOT_BFG, // 12
TRIGGER_SHOT_EXPL, // 13
TRIGGER_SHOT_BFGEXPL, // 14
+ TRIGGER_SHOT_FLAME, // 15
//
TRIGGER_SHOT_MAX = MAX,
}
//
TRIGGER_SHOT_MAX = MAX,
}
KEY_BLUETEAM, // 16
}
KEY_BLUETEAM, // 16
}
+enum HitType {
+ HIT_SOME, // 0
+ HIT_ROCKET, // 1
+ HIT_BFG, // 2
+ HIT_TRAP, // 3
+ HIT_FALL, // 4
+ HIT_WATER, // 5
+ HIT_ACID, // 6
+ HIT_ELECTRO, // 7
+ HIT_FLAME, // 8
+ HIT_SELF, // 9
+ HIT_DISCON, // 10
+}
+
////////////////////////////////////////////////////////////////////////////////
// various triggers
////////////////////////////////////////////////////////////////////////////////
// various triggers
"position" type point offset 0 as txy writedefault;
"type" alias shotType type ubyte offset 8 enum TriggerShot writedefault;
"target" alias shotTarget type ubyte offset 9 enum TriggerShotTarget writedefault;
"position" type point offset 0 as txy writedefault;
"type" alias shotType type ubyte offset 8 enum TriggerShot writedefault;
"target" alias shotTarget type ubyte offset 9 enum TriggerShotTarget writedefault;
- "quiet" type negbool offset 10; // negbool!
+ "sound" alias shotSound type negbool offset 10; // negbool!
"aim" type byte offset 11 enum TriggerShotAim default TRIGGER_SHOT_AIM_DEFAULT;
"panelid" type int offset 12 panel default null writedefault;
"sight" type ushort offset 16;
"aim" type byte offset 11 enum TriggerShotAim default TRIGGER_SHOT_AIM_DEFAULT;
"panelid" type int offset 12 panel default null writedefault;
"sight" type ushort offset 16;