rename

config/SOUE01/symbols.txt

@@ -3045,7 +3045,7 @@ getProfileId2ForName__FPCc = .text:0x8006A630; // type:function size:0x34
 getNameForProfileId__FUl = .text:0x8006A670; // type:function size:0xB8
 getActorName__FPC9ActorInfo = .text:0x8006A730; // type:function size:0x18
 getActorInfoByProfileAndSubtype__FUlUl = .text:0x8006A750; // type:function size:0x134
-getSoundSourceCategoryForName__FPCc = .text:0x8006A890; // type:function size:0x38
+getSoundSourceTypeForName__FPCc = .text:0x8006A890; // type:function size:0x38
 fn_8006A8D0 = .text:0x8006A8D0; // type:function size:0x1DC
 fn_8006AAB0 = .text:0x8006AAB0; // type:function size:0x85C
 fn_8006B310 = .text:0x8006B310; // type:function size:0x94

include/toBeSorted/actor_info.h

@@ -4,7 +4,7 @@
 #include "common.h"
 
 // TODO: Expand when we figure out what the other entries have in common
-enum SoundSourceCategory_e {
+enum SoundSourceType_e {
     SND_SOURCE_PLAYER = 0,
     SND_SOURCE_PLAYER_HEAD = 1,
     SND_SOURCE_NET = 2,
@@ -40,7 +40,7 @@ struct ActorInfo {
     /* 0x04 */ u16 profileId;
     /* 0x06 */ u16 profileId2;
     /* 0x08 */ u16 fiTextEntryId; // also used for kill counters
-    /* 0x0A */ s8 soundSourceCategory;
+    /* 0x0A */ s8 soundSourceType;
     /* 0x0B */ u8 subtype;
 };
 
@@ -50,6 +50,6 @@ u16 getProfileId2ForName(const char *name);
 const char *getNameForProfileId(u32 profileId);
 const char *getActorName(const ActorInfo *actorInfo);
 const ActorInfo *getActorInfoByProfileAndSubtype(u32 profileId, u32 subtype);
-s32 getSoundSourceCategoryForName(const char *name);
+s32 getSoundSourceTypeForName(const char *name);
 
 #endif

src/d/a/d_a_base.cpp

@@ -115,13 +115,13 @@ SoundSource *dAcBase_c::createSoundSource() {
         return nullptr;
     }
 
-    s32 soundSourceCategory = mpActorInfo->soundSourceCategory;
-    if (soundSourceCategory == -1) {
+    s32 soundSourceType = mpActorInfo->soundSourceType;
+    if (soundSourceType == -1) {
         return nullptr;
     }
 
     const char *actorName = getActorName(mpActorInfo);
-    return soundForActorInitRelated_803889c0(soundSourceCategory, this, actorName, subtype);
+    return soundForActorInitRelated_803889c0(soundSourceType, this, actorName, subtype);
 }
 
 int dAcBase_c::initAllocatorWork1Heap(int size, char *name, int align) {

src/toBeSorted/actor_info.cpp

@@ -863,10 +863,10 @@ const ActorInfo *getActorInfoByProfileAndSubtype(u32 profileId, u32 subtype) {
     return nullptr;
 }
 
-s32 getSoundSourceCategoryForName(const char *name) {
+s32 getSoundSourceTypeForName(const char *name) {
     const ActorInfo *info = getActorInfoByName(name);
     if (info != nullptr) {
-        return info->soundSourceCategory;
+        return info->soundSourceType;
     }
     return -1;
 }