mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-17 21:03:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

clangd: Started fixing warnings and errors, code cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-10-17 21:35:18 -04:00
parent f1d73f7fc7
commit 34afbd84db
58 changed files with 417 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_auction.cpp
+8 -6
View File
@@ -567,7 +567,7 @@ void daAuction_c::privateCut() {
evtRes = eventGetItem();
break;
case 7:
evtRes = &eventMesSet != NULL;
evtRes = &daAuction_c::eventMesSet != NULL;
break;
case 8:
evtRes = eventCameraOffNpc();
@@ -720,7 +720,7 @@ void daAuction_c::eventMainInit() {
restMsgTime = l_rest_msg_time1[i];
}
if (60000 > restMsgTime) break;
if (60000 > restMsgTime) break; // Bug: restMsgTime is an s16, so this condition is always true.
m82A += 1;
}
@@ -1307,7 +1307,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
dAuction_screen_slotShow();
*pMsgNo = 0x1CF8;
break;
case 0x1CF9:
case 0x1CF9: {
dComIfGp_setMiniGameRupee(mCurrBid);
dComIfGp_setAuctionRupee(mCurrBid);
if (m82C < 4) {
@@ -1330,7 +1330,8 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
setLinkAnm(1);
}
break;
case 0x1CFA:
}
case 0x1CFA: {
s16 msgSetNo = dComIfGp_getMessageSetNumber();
if (dComIfGs_getRupee() < msgSetNo) {
@@ -1371,6 +1372,7 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
dComIfGp_setMessageCountNumber(mCurrBid);
}
break;
}
case 0x1CFC:
if (mpCurrMsg->mSelectNum == 0) {
*pMsgNo = 0x1D1F;
@@ -1396,13 +1398,13 @@ u16 daAuction_c::next_msgStatus(u32* pMsgNo) {
case 0x1D20:
case 0x1D21:
case 0x1D22:
case 0x1D23:
case 0x1D23: {
setLinkAnm(0x14);
int rnd = getRand(6) + 1;
*pMsgNo = l_npc_msg_dat[getAucMdlNo(rnd)].field_0x06;
m825 = rnd;
break;
}
case 0x1D48:
case 0x33A2:
case 0x33A8: