From 6c033f8cc5788fc8cf84633418a4e5e83fe6a9b2 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 29 May 2021 23:01:00 +1000
Subject: [PATCH] Decompile func0f08ae0c

---
 src/game/propobj.c         | 33 +++++++++++----------------------
 src/include/game/propobj.h |  2 +-
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/game/propobj.c b/src/game/propobj.c
index 0b11b2abd..9363bd5c1 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -64914,28 +64914,17 @@ struct prop *func0f08adc8(struct weaponobj *weapon, struct modelfiledata *fileda
 	return prop;
 }
 
-GLOBAL_ASM(
-glabel func0f08ae0c
-/*  f08ae0c:	27bdffe0 */ 	addiu	$sp,$sp,-32
-/*  f08ae10:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f08ae14:	0fc1a94b */ 	jal	func0f06a52c
-/*  f08ae18:	00000000 */ 	nop
-/*  f08ae1c:	10400008 */ 	beqz	$v0,.L0f08ae40
-/*  f08ae20:	00402025 */ 	or	$a0,$v0,$zero
-/*  f08ae24:	240e0004 */ 	addiu	$t6,$zero,0x4
-/*  f08ae28:	a04e0000 */ 	sb	$t6,0x0($v0)
-/*  f08ae2c:	afa2001c */ 	sw	$v0,0x1c($sp)
-/*  f08ae30:	00002825 */ 	or	$a1,$zero,$zero
-/*  f08ae34:	0fc22ed7 */ 	jal	weaponSetGunfireVisible
-/*  f08ae38:	2406ffff */ 	addiu	$a2,$zero,-1
-/*  f08ae3c:	8fa4001c */ 	lw	$a0,0x1c($sp)
-.L0f08ae40:
-/*  f08ae40:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f08ae44:	27bd0020 */ 	addiu	$sp,$sp,0x20
-/*  f08ae48:	00801025 */ 	or	$v0,$a0,$zero
-/*  f08ae4c:	03e00008 */ 	jr	$ra
-/*  f08ae50:	00000000 */ 	nop
-);
+struct prop *func0f08ae0c(struct weaponobj *weapon, struct modelfiledata *filedata)
+{
+	struct prop *prop = func0f06a52c(&weapon->base, filedata);
+
+	if (prop) {
+		prop->type = PROPTYPE_WEAPON;
+		weaponSetGunfireVisible(prop, false, -1);
+	}
+
+	return prop;
+}
 
 GLOBAL_ASM(
 glabel func0f08ae54
diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h
index 581888f34..5ea1b0584 100644
--- a/src/include/game/propobj.h
+++ b/src/include/game/propobj.h
@@ -280,7 +280,7 @@ void coordTriggerProxies(struct coord *pos, bool arg1);
 void chrsTriggerProxies(void);
 void propweaponSetDual(struct weaponobj *weapon1, struct weaponobj *weapon2);
 struct prop *func0f08adc8(struct weaponobj *weapon, struct modelfiledata *filedata, struct prop *prop, struct model *model);
-u32 func0f08ae0c(void);
+struct prop *func0f08ae0c(struct weaponobj *weapon, struct modelfiledata *filedata);
 u32 func0f08ae54(struct defaultobj *obj, struct chrdata *chr);
 struct prop *func0f08b108(struct weaponobj *weapon, struct chrdata *chr, struct modelfiledata *modelfiledata, struct prop *prop, struct model *model);
 void func0f08b208(struct weaponobj *weapon, struct chrdata *chr);