diff options
| author | Max Roncace <me@caseif.net> | 2025-12-06 16:39:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-06 13:39:30 -0800 |
| commit | 136f6b3f40ec4fe16910c9680a3c88270be6c46e (patch) | |
| tree | 8b42e15ecc869097e1b3daeb401d08a5afa28398 /src/d/d_event_manager.cpp | |
| parent | a30e617e5a9b8264053788429a587ee1763eae73 (diff) | |
d_kankyo debug work (#2918)
* Global: Define DEBUG as 0 if not already defined
* Clean up DEBUG-guarded code
* d_kankyo debug almost matching
Diffstat (limited to 'src/d/d_event_manager.cpp')
| -rw-r--r-- | src/d/d_event_manager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index f6efd6d107..90c3110e0d 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -329,12 +329,11 @@ int dEvent_manager_c::create() { } bool dEvent_manager_c::setObjectArchive(char* arcname) { - char* rt = NULL; + void* rt = NULL; if (arcname != NULL) { - char* res = (char*)dComIfG_getObjectRes(arcname, DataFileName); - rt = res; - int base_status = mEventList[BASE_ACTOR].init(res, -1); + rt = dComIfG_getObjectRes(arcname, DataFileName); + int base_status = mEventList[BASE_ACTOR].init((char*)rt, -1); #if DEBUG if (base_status) { @@ -1382,7 +1381,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 actorName, BOOL param_1) { shutterActor = fopAcM_Search((fopAcIt_JudgeFunc)findShutterCallBack, &prms); if (shutterActor != NULL && param_1) { cXyz goal(shutterActor->home.pos); - s16 angle = prms.actor->home.angle.y + 0x8000; + s16 angle = prms.actor->home.angle.y; + angle = angle + 0x8000; goal.x += cM_ssin(angle) * 100; goal.z += cM_scos(angle) * 100; |