mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-01 17:57:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compiler warnings (#44)

Browse Source
This commit is contained in:
robojumper
2024-10-01 14:55:30 +02:00
committed by GitHub
parent 4d9a0d6390
commit eae2d7a2bf
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/c/c_math.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include <common.h>
namespace cM {
static s16 atan2s(f32, f32);
s16 atan2s(f32, f32);
void initRnd(s32);
f32 rnd();
int rndInt(int max);
include/nw4r/snd/snd_Util.h
+1 -1
View File
@@ -47,7 +47,7 @@ struct DataRef {
template <typename T> struct Table {
u32 count; // at 0x0
T items[]; // at 0x4
T items[1]; // at 0x4
};
template <typename T0, typename T1, typename T2, typename T3>
src/f/f_base.cpp
+5 -5
View File
@@ -120,7 +120,7 @@ int fBase_c::doDelete() {
/* 802e1680 */
int fBase_c::createPack() {
// Returns PACK_RESULT_e
return commonPack(&create, &preCreate, &postCreate);
return commonPack(&fBase_c::create, &fBase_c::preCreate, &fBase_c::postCreate);
}
/* 802e1730 */
@@ -168,7 +168,7 @@ void fBase_c::postDelete(MAIN_STATE_e state) {
/* 802e15d0 */
int fBase_c::deletePack() {
// Returns PACK_RESULT_e
return commonPack(&doDelete, &preDelete, &postDelete);
return commonPack(&fBase_c::doDelete, &fBase_c::preDelete, &fBase_c::postDelete);
}
/* 802e1910 */
@@ -195,12 +195,12 @@ void fBase_c::postExecute(MAIN_STATE_e state) {
/* 802e1960 */
int fBase_c::executePack() {
// Returns PACK_RESULT_e
int result = commonPack(&execute, &preExecute, &postExecute);
int result = commonPack(&fBase_c::execute, &fBase_c::preExecute, &fBase_c::postExecute);
// Check force update list (bamboo cut to force a cut type of thing)
fLiNdBa_c *node = m_forceExecuteList.getFirst();
while (node != nullptr) {
node->p_owner->commonPack(&execute, &preExecute, &postExecute);
node->p_owner->commonPack(&fBase_c::execute, &fBase_c::preExecute, &fBase_c::postExecute);
fLiNdBa_c *tempNode = node->getNext();
m_forceExecuteList.remove(node);
node = tempNode;
@@ -233,7 +233,7 @@ void fBase_c::postDraw(MAIN_STATE_e state) {
/* 802e1ae0 */
int fBase_c::drawPack() {
// Returns PACK_RESULT_e
return commonPack(&draw, &preDraw, &postDraw);
return commonPack(&fBase_c::draw, &fBase_c::preDraw, &fBase_c::postDraw);
}
/* 802e1b90 */