Decompile propobjInteract

src/include/constants.h

@@ -1477,7 +1477,7 @@
 #define OBJFLAG_00010000             0x00010000 // Not used in scripts
 #define OBJFLAG_INVINCIBLE           0x00020000
 #define OBJFLAG_COLLECTABLE          0x00040000
-#define OBJFLAG_00080000             0x00080000 // Not used in scripts
+#define OBJFLAG_00080000             0x00080000 // Thrown laptop?
 #define OBJFLAG_UNCOLLECTABLE        0x00100000
 #define OBJFLAG_00200000             0x00200000 // Editor: "Bounce and Destroy If Shot"
 #define OBJFLAG_00400000             0x00400000 // Not used in scripts
@@ -1581,7 +1581,7 @@
 #define OBJTYPE_DOORSCALE        0x02
 #define OBJTYPE_BASIC            0x03
 #define OBJTYPE_KEY              0x04
-#define OBJTYPE_05               0x05
+#define OBJTYPE_ALARM            0x05
 #define OBJTYPE_CAMERA           0x06
 #define OBJTYPE_AMMOCRATE        0x07
 #define OBJTYPE_WEAPON           0x08

src/include/game/data/data_00e460.h

@@ -45,7 +45,7 @@ extern u32 var8006992c;
 extern u32 var8006993c;
 extern f32 g_AmmoMultiplier;
 extern u32 var80069964;
-extern u32 var80069968;
+extern struct autogunobj *g_ThrownLaptops;
 extern u32 var80069970;
 extern u32 var80069974;
 extern u32 var80069978;

src/include/game/game_097ba0.h

@@ -158,8 +158,8 @@ s32 ammotypeGetMaxCapacity(u32 ammotype);
 bool ammotypeAllowsUnlimitedAmmo(u32 ammotype);
 u32 func0f0a9980(void);
 s32 weaponGetAmmoType(s32 weaponnum, u32 func);
-u32 func0f0a9a74(void);
-u32 func0f0a9ac4(void);
+s32 func0f0a9a74(s32 weaponnum, s32 arg1);
+void func0f0a9ac4(s32 weaponnum, s32 arg1, s32 arg2);
 u32 func0f0a9b10(void);
 u32 func0f0a9b68(void);
 u32 func0f0a9d2c(void);

src/include/game/game_0f09f0.h

@@ -75,7 +75,7 @@ char *menuTextSaveDeviceName(struct menu_item *item);
 u32 func0f0fd118(u32 arg0);
 bool func0f0fd1f4(u32 arg0, u32 arg1);
 u32 func0f0fd320(void);
-u32 func0f0fd494(void);
+void func0f0fd494(struct coord *pos);
 void func0f0fd548(s32 arg0);
 u32 func0f0fd570(void);
 bool currentPlayerIsInTraining(void);

src/include/game/game_179060.h

@@ -114,7 +114,7 @@ u32 func0f186780(void);
 u32 chrGiveBriefcase(struct chrdata *chr, struct prop *prop);
 u32 func0f187288(void);
 bool chrGiveUplink(struct chrdata *chr, struct prop *prop);
-u32 func0f1876e4(void);
+void func0f1876e4(struct chrdata *chr, struct prop *prop);
 s32 menuhandlerMpDropOut(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandlerMpTeamsLabel(u32 operation, struct menu_item *item, s32 *value);
 u32 func0f1790fc(void);

src/include/game/propobj.h

@@ -225,11 +225,11 @@ void func0f0852ac(struct defaultobj *obj, f32 damage, struct coord *pos, s32 arg
 u32 func0f0859a0(void);
 u32 func0f085e00(void);
 u32 func0f085eac(void);
-u32 func0f086918(void);
+u32 propobjGetCiTagId(struct prop *prop);
 u32 objIsHealthy(struct defaultobj *obj);
 u32 func0f0869cc(void);
 bool func0f086d60(struct prop *prop);
-void func0f086f40(struct prop *prop);
+bool propobjInteract(struct prop *prop);
 void propObjSetOrUnsetHiddenFlag00400000(struct prop *prop, bool enable);
 u32 func0f087458(void);
 void propObjGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);

src/include/types.h

@@ -958,6 +958,7 @@ struct autogunobj { // objtype 0d
 	/*0xa0*/ u32 unka0;
 	/*0xa4*/ u32 unka4;
 	/*0xa8*/ u8 autogun_type;
+	/*0xa9*/ u8 unka9;
 };
 
 struct multiammocrateobj { // objtype 14