Discover proptypes explosion and effect

src/include/commands.h

@@ -2702,15 +2702,16 @@
 	label,
 
 /**
- * Checks if there is a live grenade or other dangerous object nearby. If so,
- * the position of the object is stored in the chr's runfrompos property and the
- * command passes.
+ * Checks if there is a live grenade or explosion nearby. If so, the position of
+ * the object is stored in the chr's runfrompos property and the command passes.
  *
  * The flags argument is a bitfield which specifies what types of objects to
  * look for.
  *
  * Flag 0x1 = check for grenades
- * Flag 0x2 = check for prop type 7 (unsure what this is at the moment)
+ * Flag 0x2 = check for explosions
+ *
+ * Set to 0x3 to check for both.
  *
  * Those are the only supported flags.
  */

src/include/constants.h

@@ -1530,13 +1530,14 @@
 #define PROPFLAG_40     0x40
 #define PROPFLAG_80     0x80
 
-#define PROPTYPE_OBJ    1
-#define PROPTYPE_DOOR   2
-#define PROPTYPE_CHR    3
-#define PROPTYPE_WEAPON 4
-#define PROPTYPE_EYESPY 5
-#define PROPTYPE_PLAYER 6
-#define PROPTYPE_7      7
+#define PROPTYPE_OBJ       1
+#define PROPTYPE_DOOR      2
+#define PROPTYPE_CHR       3
+#define PROPTYPE_WEAPON    4
+#define PROPTYPE_EYESPY    5
+#define PROPTYPE_PLAYER    6
+#define PROPTYPE_EXPLOSION 7
+#define PROPTYPE_EFFECT    8
 
 #define RACE_HUMAN    0
 #define RACE_SKEDAR   1

src/include/game/game_0601b0.h

@@ -53,7 +53,7 @@ u32 func0f065dd8(void);
 u32 func0f065dfc(void);
 u32 func0f065e74(void);
 u32 func0f065e98(void);
-void func0f065f80(s16 *room, s16 *propnums, u32 size);
+void roomGetProps(s16 *room, s16 *propnums, u32 size);
 u32 func0f066054(void);
 void propGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);
 u32 func0f066290(void);