From 3ad8607a78b502b7b08f1d7a2cd661ee39293231 Mon Sep 17 00:00:00 2001
From: Shinovon <arman200711@gmail.com>
Date: Thu, 7 May 2026 03:28:28 +0500
Subject: [PATCH] Fix another crash, update todo

---
 TODO.md                | 11 ++++++-----
 group/common.mmh       |  2 +-
 src/peds/PlayerPed.cpp |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/TODO.md b/TODO.md
index 4de6e4f..dcb5a14 100644
--- a/TODO.md
+++ b/TODO.md
@@ -8,8 +8,8 @@ Common:
 - [ ] Touch controls
 - [x] Keyboard controls
 - [ ] Audio?
-- [ ] Menu
-- [ ] Config
+- [x] Menu
+- [x] Config
 - [x] Merge S60v3 and ^3 branches
 - [ ] Move map to top left corner
 
@@ -26,6 +26,7 @@ GLES 1.1 specific:
 - [ ] Use pvrtc compression
 
 Issues:
-- [ ] Fix crash in Texture::destroy on exit
-- [ ] Save menu is too slow
-- [ ] HUD disappearing on GLES 2.0
\ No newline at end of file
+- [x] Fix crash in Texture::destroy on exit
+- [x] Save menu is too slow
+- [x] HUD disappearing on GLES 2.0 (mostly fixed, was caused by OOM)
+- [x] Crash when picking up a bat
diff --git a/group/common.mmh b/group/common.mmh
index 59915c0..3c7bbaf 100644
--- a/group/common.mmh
+++ b/group/common.mmh
@@ -18,7 +18,7 @@ SRCDBG
 OPTION ARMCC --gnu -Otime --diag_suppress 1,68,111,174,381,1293
 OPTION_REPLACE ARMCC --cpu 6
 OPTION_REPLACE ARMCC --fpu softvfp+vfpv2 --fpmode fast
-OPTION_REPLACE ARMCC -O2 -O3
+OPTION_REPLACE ARMCC -O2 -O3 // too dangerous!
 #ifdef ARMCC
 ALWAYS_BUILD_AS_ARM
 #endif
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index ef87796..4876f79 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -1,3 +1,7 @@
+#if defined __ARMCC_VERSION && !defined _DEBUG
+#pragma O2 // fixes crash
+#endif
+
 #include "common.h"
 
 #include "RwHelper.h"