summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_npc_rsh1.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2026-03-04 13:47:40 -0500
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2026-03-04 13:47:40 -0500
commit256b4eeb37caccb3fc3a62bb40b69e7b4907c9a1 (patch)
tree24c6a8a2c3bf787eabed5004fa1d8180a0f43276 /src/d/actor/d_a_npc_rsh1.cpp
parentdcf4862387fb9be67f7aff9fe4f986d129366662 (diff)
Fix some clangd errors
Diffstat (limited to 'src/d/actor/d_a_npc_rsh1.cpp')
-rw-r--r--src/d/actor/d_a_npc_rsh1.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp
index f3a01504..e25e8a17 100644
--- a/src/d/actor/d_a_npc_rsh1.cpp
+++ b/src/d/actor/d_a_npc_rsh1.cpp
@@ -879,7 +879,7 @@ u16 daNpc_Rsh1_c::shop_talk() {
/* 00001DE4-00001FE0 .text talk__12daNpc_Rsh1_cFv */
u16 daNpc_Rsh1_c::talk() {
- u16 result = 0xFF;
+ u16 status = 0xFF;
if (m961 == 0) {
l_msgId = fpcM_ERROR_PROCESS_ID_e;
@@ -904,10 +904,10 @@ u16 daNpc_Rsh1_c::talk() {
setAnmFromMsgTag();
switch (m961) {
case 2:
- result = normal_talk();
+ status = normal_talk();
break;
case 3:
- result = shop_talk();
+ status = shop_talk();
break;
}
if (dComIfGp_checkMesgSendButton()) {
@@ -933,7 +933,7 @@ u16 daNpc_Rsh1_c::talk() {
mShopCamAct.m54 = mpShopItems->mSelectedItemIdx;
}
- return result;
+ return status;
}
/* 00001FE0-00002358 .text CreateInit__12daNpc_Rsh1_cFv */