From 4ccca6b893fbf9f690d0e7efc33ff57c63e701bc Mon Sep 17 00:00:00 2001
From: Huitzi <73550465+marwernerh@users.noreply.github.com>
Date: Sun, 30 Mar 2025 23:11:50 -0400
Subject: d_event_debug equivalent & modifications to dEvLib_callback_c (#2359)

* WIP d_event_debug
* Implemented most functions close to matching
* Removed erroneous comment in d_com_inf_game.h
* Implemented getEventP in dEvDtBase_c
* Retyped dEvLib_callback_c function returns from BOOL to bool
* Implemented getHeader, getEventList, and setDbgData in dEvent_manager_c
* Moved relevant dEvDb_* classes from d_event.h to d_event_debug.h and changed to structs
* Extended JORFile mFilename character array from 8 to 256 characters
* Implemented combo boxes and update slider functionalities in JORMContext
* Named field_0xC of JORProperyEvent as id, based on use of field in d_event_debug.cpp
* Corrected debug event tables and created missing table
* Debug tables explicitly pasted in d_event_debug.cpp to circumvent ShiftJIS not properly encoding tables via #include directive

* Change return types for implemented virtual functions of actors that inherit from dEvLib_callback_c

* Add const modifier to several d_com_inf_game functions called in d_event_debug, and change respective fields in dEvDb_bit & reg_c to be const

* d_event_debug Equivalent
* Changed configure.py entry to equivalent instead of matching
* Preliminary documentation

* Remove debug tables from d_event.cpp
---
 src/JSystem/JHostIO/JORServer.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/JSystem')

diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp
index 59d57f646a..1143a75e8a 100644
--- a/src/JSystem/JHostIO/JORServer.cpp
+++ b/src/JSystem/JHostIO/JORServer.cpp
@@ -90,19 +90,19 @@ void JORReflexible::listenPropertyEvent(const JORPropertyEvent* pEvent) {
         case 'CMBX':
             if (pEvent->field_0x14 >= 4) {
                 JORPropertyEvent* event = (JORPropertyEvent*)pEvent;
-                JORServer::defSetVal(event->field_0xc, event->kind, event->field_0x18.U32);
+                JORServer::defSetVal(event->id, event->kind, event->field_0x18.U32);
             }
             break;
         case 'CHBX':
             if (pEvent->field_0x14 >= 4) {
                 JORPropertyEvent* event = (JORPropertyEvent*)pEvent;
-                JORServer::defSetBitVal(event->field_0xc, event->kind, (u16)event->field_0x18.U16[0], (u16)event->field_0x18.U16[1]);
+                JORServer::defSetBitVal(event->id, event->kind, (u16)event->field_0x18.U16[0], (u16)event->field_0x18.U16[1]);
             }
             break;
         case 'EDBX':
             JORPropertyEvent* event = (JORPropertyEvent*)pEvent;
             JSUMemoryInputStream stream(&event->field_0x18, event->field_0x14);
-            stream >> event->field_0xc;
+            stream >> event->id;
             break;
         }
         return;
-- 
cgit v1.2.3