Misc matches (#2845)

* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches

1 files changed, 11 insertions, 8 deletions

diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp
index 55beed1766..32823eeddd 100644
--- a/src/d/actor/d_a_obj_timer.cpp
+++ b/src/d/actor/d_a_obj_timer.cpp
@@ -104,30 +104,31 @@ bool daObjTimer::Act_c::_execute() {
     }
 }
 
+namespace daObjTimer {
+
 namespace {
     /* 804855A4-804855C0 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Create */
-    int Mthd_Create(fopAc_ac_c* i_this) {
+    int Mthd_Create(void* i_this) {
         return static_cast<daObjTimer::Act_c*>(i_this)->_create();
     }
 
     /* 804855C4-804855E4 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Delete */
-    int Mthd_Delete(fopAc_ac_c* i_this) {
+    int Mthd_Delete(void* i_this) {
         return static_cast<daObjTimer::Act_c*>(i_this)->_delete();
     }
 
     /* 804855E8-80485608 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Execute */
-    int Mthd_Execute(fopAc_ac_c* i_this) {
-        // NONMATCHING
+    int Mthd_Execute(void* i_this) {
         return static_cast<daObjTimer::Act_c*>(i_this)->_execute();
     }
 
     /* 8048560C-80485610 .text                      daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Draw */
-    int Mthd_Draw(fopAc_ac_c* i_this) {
+    int Mthd_Draw(void* i_this) {
         return 1;
     }
 
     /* 80485614-80485618 .text                  daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_IsDelete */
-    int Mthd_IsDelete(fopAc_ac_c* i_this) {
+    int Mthd_IsDelete(void* i_this) {
         return 1;
     }
 
@@ -139,7 +140,9 @@ namespace {
         (process_method_func)Mthd_IsDelete,
         (process_method_func)Mthd_Draw,
     };
-}
+}  // namespace
+
+};  // namespace daObjTimer
 
 /* 804856B8-804856E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Timer */
 extern actor_process_profile_definition g_profile_Obj_Timer = {
@@ -153,7 +156,7 @@ extern actor_process_profile_definition g_profile_Obj_Timer = {
   0,                        // mParameters
   &g_fopAc_Method.base,     // sub_method
   22,                       // mPriority
-  &l_daTimer_Method,           // sub_method
+  &daObjTimer::l_daTimer_Method,           // sub_method
   0x00040000,               // mStatus
   fopAc_ACTOR_e,            // mActorType
   fopAc_CULLBOX_0_e,        // cullType