Some GCC compilation fixes (#3114)

* Fix 6-byte multichar literals

* Add `struct` to `e_ga_class::ga_s`

* Fix remaining wrong forward declares (struct/class)

* Replace `#include <string>` with `#include <cstring>`

* Guard FLT_EPSILON define to prevent redefinition

* Add missing `#include <cstring>` for direct cstring function usage
This commit is contained in:
Luke Street
2026-02-28 13:11:00 -07:00
committed by GitHub
parent d017a3cd36
commit c900a043b8
347 changed files with 402 additions and 73 deletions
+1
View File
@@ -5,6 +5,7 @@
#include "JSystem/JUtility/JUTFont.h"
#include <cstdio>
#include <cstdlib>
#include <cstring>
char* J2DPrint::mStrBuff;
+1
View File
@@ -5,6 +5,7 @@
#include "JSystem/JSupport/JSURandomInputStream.h"
#include "JSystem/JUtility/JUTResFont.h"
#include "JSystem/JUtility/JUTResource.h"
#include <cstring>
J2DTextBox::J2DTextBox()
: mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() {
+1
View File
@@ -4,6 +4,7 @@
#include "JSystem/JAHostIO/JAHioMessage.h"
#include "JSystem/JAHostIO/JAHioMgr.h"
#include "JSystem/JHostIO/JORServer.h"
#include <cstring>
JAHioNode::JAHioNode(const char* name) : mTree(this) {
mLastChild = NULL;
+1
View File
@@ -15,6 +15,7 @@
#include "JSystem/JAudio2/JAUStreamFileTable.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include <dolphin/dvd.h>
#include <cstring>
namespace {
class TPushCurrentHeap {
+1
View File
@@ -7,6 +7,7 @@
#include "JSystem/JKernel/JKRAram.h"
#include <dolphin/gx.h>
#include <stdint.h>
#include <cstring>
#include "angle_utils.h"
JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) {
+1
View File
@@ -5,6 +5,7 @@
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JUtility/JUTVideo.h"
#include <cstdio>
#include <cstring>
JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) {
mFont = pFont;
+1
View File
@@ -9,6 +9,7 @@
#include <cstdlib>
#include <dolphin/dolphin.h>
#include <stdint.h>
#include <cstring>
struct CallbackObject {
/* 0x00 */ JUTExceptionUserCallback callback;
+1
View File
@@ -5,6 +5,7 @@
#include "JSystem/JAudio2/JASCriticalSection.h"
#include <revolution/os.h>
#include <revolution/wpad.h>
#include <cstring>
OSAlarm sSpeakerAlarm;
SpeakerInfo sSpeakerInfo[WPAD_MAX_CONTROLLERS];
+1
View File
@@ -5,6 +5,7 @@
#include "JSystem/JKernel/JKRHeap.h"
#include "Z2AudioLib/Z2FxLineMgr.h"
#include "m_Do/m_Do_ext.h"
#include <cstring>
Z2AudioArcLoader::Z2AudioArcLoader(JAUSection* section) : JAUAudioArcLoader(section) {}
+1
View File
@@ -11,6 +11,7 @@
#include "Z2AudioLib/Z2SoundObjMgr.h"
#include "Z2AudioLib/Z2StatusMgr.h"
#include "d/d_com_inf_game.h"
#include <cstring>
Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) {
sceneNum = -1;
+1
View File
@@ -4,6 +4,7 @@
#include "Z2AudioLib/Z2Calc.h"
#include "Z2AudioLib/Z2SceneMgr.h"
#include "Z2AudioLib/Z2LinkMgr.h"
#include <cstring>
Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance<Z2SoundObjMgr>(true) {
ghostEnemyState_ = 0;
+1
View File
@@ -2,6 +2,7 @@
#include "Z2AudioLib/Z2Param.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include <cstring>
static const char* sSpotName[] = {
"F_SP00",
+1
View File
@@ -9,6 +9,7 @@
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_ext.h"
#include <cstring>
#if DEBUG
#include "f_pc/f_pc_debug_sv.h"
+1
View File
@@ -52,6 +52,7 @@
#include "d/d_s_play.h"
#include "res/Object/Alink.h"
#include <cstring>
static int daAlink_Create(fopAc_ac_c* i_this);
static int daAlink_Delete(daAlink_c* i_this);
+1
View File
@@ -6,6 +6,7 @@
#include "JSystem/JHostIO/JORFile.h"
#include "d/actor/d_a_alink.h"
#include "d/d_com_inf_game.h"
#include <cstring>
#if DEBUG
+1
View File
@@ -21,6 +21,7 @@
#include "d/actor/d_a_npc_zra.h"
#include "d/actor/d_a_obj_tks.h"
#include "d/actor/d_a_npc_tkc.h"
#include <cstring>
BOOL daAlink_c::checkEventRun() const {
return dComIfGp_event_runCheck() || checkPlayerDemoMode();
+1
View File
@@ -12,6 +12,7 @@
#include "Z2AudioLib/Z2Instances.h"
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
class daB_GG_HIO_c : public JORReflexible {
public:
+1
View File
@@ -7,6 +7,7 @@
#include "d/actor/d_a_b_tn.h"
#include <cmath>
#include <cstring>
#include "Z2AudioLib/Z2Instances.h"
#include "d/actor/d_a_boomerang.h"
#include "d/actor/d_a_nbomb.h"
+1
View File
@@ -23,6 +23,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
class daB_YO_HIO_c {
public:
+1
View File
@@ -18,6 +18,7 @@
#include "d/d_pane_class.h"
#include "m_Do/m_Do_graphic.h"
#include "m_Do/m_Do_lib.h"
#include <cstring>
class daBalloon2D_HIO_c : public mDoHIO_entry_c {
public:
+1
View File
@@ -13,6 +13,7 @@
#include "d/d_s_play.h"
#include "f_op/f_op_camera_mng.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
+1
View File
@@ -16,6 +16,7 @@
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
#include <cstring>
const char* daBg_c::setArcName() {
static char arcName[32];
+1
View File
@@ -9,6 +9,7 @@
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include <cstdio>
#include <dolphin/os.h>
#include <cstring>
#include "d/actor/d_a_set_bgobj.h"
#include "d/d_s_play.h"
#include "SSystem/SComponent/c_math.h"
+1
View File
@@ -14,6 +14,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
#if DEBUG
static BOOL l_debugMode;
+1
View File
@@ -12,6 +12,7 @@
#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J2DGraph/J2DAnmLoader.h"
#include <cstring>
class daCoach2D_HIO_c : public mDoHIO_entry_c {
public:
+1
View File
@@ -16,6 +16,7 @@
#include "d/d_meter2_info.h"
#include "d/d_timer.h"
#include <dolphin/types.h>
#include <cstring>
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera_mng.h"
#include "m_Do/m_Do_ext.h"
+1
View File
@@ -9,6 +9,7 @@
#include "d/actor/d_a_alink.h"
#include "d/actor/d_a_crod.h"
#include "d/d_bg_w.h"
#include <cstring>
enum daCstaF_Action {
ACTION_WAIT,
+1
View File
@@ -20,6 +20,7 @@
#include "d/actor/d_a_movie_player.h"
#if DEBUG
#include "d/d_debug_viewer.h"
#include <cstring>
#endif
struct UnknownLightData {
+1
View File
@@ -13,6 +13,7 @@
#include "d/actor/d_a_player.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f);
+1
View File
@@ -15,6 +15,7 @@
#include "d/d_a_item_static.h"
#include "m_Do/m_Do_controller_pad.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
static bool noFallCheck;
static bool hio_set;
+1
View File
@@ -13,6 +13,7 @@
#include "d/d_meter2_info.h"
#include "SSystem/SComponent/c_math.h"
#include "f_op/f_op_actor_mng.h"
#include <cstring>
static char* l_stageName[20] = {
"D_MN05",
+1
View File
@@ -12,6 +12,7 @@
#include "d/d_meter2_info.h"
#include "SSystem/SComponent/c_math.h"
#include <cstdio>
#include <cstring>
u32 knob_param_c::getDoorModel(fopAc_ac_c* i_this) {
return fopAcM_GetParamBit(i_this, 5, 3);
+1
View File
@@ -15,6 +15,7 @@
#include "d/d_map_path_dmap.h"
#include "SSystem/SComponent/c_math.h"
#include <cstdio>
#include <cstring>
char* daDoor20_c::getStopBmdName() {
switch (door_param2_c::getKind(this)) {
+1
View File
@@ -11,6 +11,7 @@
#include "d/actor/d_a_obj_fw.h"
#include "Z2AudioLib/Z2Instances.h"
#include "f_op/f_op_actor_enemy.h"
#include <cstring>
class daE_BI_HIO_c : public JORReflexible {
public:
+1
View File
@@ -10,6 +10,7 @@
#include "d/d_path.h"
#include "d/actor/d_a_nbomb.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum E_bug_RES_File_ID {
/* BMDG */
+1
View File
@@ -13,6 +13,7 @@
#include "d/actor/d_a_horse.h"
#include "f_op/f_op_actor_enemy.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
class daE_DN_HIO_c : public JORReflexible {
public:
+1
View File
@@ -16,6 +16,7 @@
#include "d/d_s_play.h"
#include "f_op/f_op_actor_enemy.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
class daE_Fs_HIO_c {
public:
+1
View File
@@ -13,6 +13,7 @@
#include "d/actor/d_a_obj_smallkey.h"
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
enum Head_Action {
/* 0x0 */ HEAD_ACTION_WAIT,
+1
View File
@@ -9,6 +9,7 @@
#include "d/actor/d_a_alink.h"
#include "d/d_debug_viewer.h"
#include "f_op/f_op_actor_enemy.h"
#include <cstring>
class daE_HP_HIO_c : public JORReflexible {
public:
+1
View File
@@ -13,6 +13,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "d/actor/d_a_horse.h"
#include "d/d_com_inf_game.h"
#include <cstring>
class daE_MF_HIO_c : public JORReflexible {
public:
+1
View File
@@ -19,6 +19,7 @@
#include "d/d_camera.h"
#include "f_op/f_op_camera_mng.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
class daE_MK_HIO_c : public JORReflexible {
public:
+1
View File
@@ -11,6 +11,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "d/d_s_play.h"
#include "f_op/f_op_actor_enemy.h"
#include <cstring>
class daE_MS_HIO_c : public JORReflexible {
public:
+1
View File
@@ -14,6 +14,7 @@
#include "d/d_bomb.h"
#include "d/d_procname.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
static bool hio_set;
+1
View File
@@ -14,6 +14,7 @@
#include "d/d_cc_uty.h"
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
enum OC_ACTIONS {
+1
View File
@@ -11,6 +11,7 @@
#include "d/actor/d_a_player.h"
#include "d/d_s_play.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
#define PH_BMD 20
+1
View File
@@ -12,6 +12,7 @@
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
static s16 mAttackNo = 3;
+1
View File
@@ -24,6 +24,7 @@
#include "d/actor/d_a_npc_tk.h"
#include "Z2AudioLib/Z2Instances.h"
#include "f_op/f_op_actor_enemy.h"
#include <cstring>
class daE_RD_HIO_c : public JORReflexible {
public:
+1
View File
@@ -14,6 +14,7 @@
#include "m_Do/m_Do_graphic.h"
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
class daE_RDB_HIO_c : public JORReflexible {
public:
+1
View File
@@ -19,6 +19,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "f_op/f_op_actor_enemy.h"
#include "m_Do/m_Do_graphic.h"
#include <cstring>
class daE_RDY_HIO_c : public JORReflexible {
public:
+1
View File
@@ -14,6 +14,7 @@
#include "d/d_s_play.h"
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
class daE_S1_HIO_c {
public:
+1
View File
@@ -11,6 +11,7 @@
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum E_sf_RES_File_ID {
/* BCK */
+1
View File
@@ -11,6 +11,7 @@
#include "d/actor/d_a_arrow.h"
#include "Z2AudioLib/Z2Instances.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
enum E_SM_RES_File_ID {
/* BCK */
+1
View File
@@ -12,6 +12,7 @@
#include "SSystem/SComponent/c_counter.h"
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c {
public:
+1
View File
@@ -9,6 +9,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "f_op/f_op_actor_enemy.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum E_st_RES_File_ID {
/* BCK */
+1
View File
@@ -10,6 +10,7 @@
#include "d/actor/d_a_horse.h"
#include "d/actor/d_a_obj_ihasi.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
static int daE_Warpappear_Draw(e_warpappear_class* i_this) {
int sw = (fopAcM_GetParam(i_this) >> 8) & 0xFF;
+1
View File
@@ -18,6 +18,7 @@
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "res/Object/Always.h"
#include <cstring>
class daE_WB_HIO_c : public JORReflexible {
+1
View File
@@ -11,6 +11,7 @@
#include "d/d_cc_uty.h"
#include "f_op/f_op_actor_enemy.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum E_ww_RES_File_ID {
/* BCK */
+1
View File
@@ -14,6 +14,7 @@
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_enemy.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
class daE_YM_HIO_c: public JORReflexible {
public:
+1
View File
@@ -13,6 +13,7 @@
#include "Z2AudioLib/Z2Instances.h"
#include "d/d_debug_viewer.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
enum E_ZH_RES_File_ID {
/* BCK */
+1
View File
@@ -14,6 +14,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "f_op/f_op_kankyo_mng.h"
#include <cstring>
class daFr_HIO_c : public JORReflexible {
public:
+1
View File
@@ -18,6 +18,7 @@
#include "Z2AudioLib/Z2Instances.h"
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include <cmath>
#include <cstring>
#define ANM_HS_BACK_WALK 6
#define ANM_HS_WALK_START 7
+1
View File
@@ -11,6 +11,7 @@
#include "d/d_msg_object.h"
#include <cmath>
#include <cstring>
#include "d/actor/d_a_balloon_2D.h"
#include "d/actor/d_a_e_ym.h"
+1
View File
@@ -9,6 +9,7 @@
#include "d/actor/d_a_npc4.h"
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include <cstring>
static int daKytag04_Draw(kytag04_class* i_this) {
dScnKy_env_light_c* kankyo = dKy_getEnvlight();
+1
View File
@@ -12,6 +12,7 @@
#include "d/d_procname.h"
#include "f_op/f_op_camera_mng.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) {
dScnKy_env_light_c* env_light = dKy_getEnvlight();
+1
View File
@@ -11,6 +11,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_rain.h"
#include "d/d_kankyo_wether.h"
#include <cstring>
static BOOL d_kytag12_cut_turn_check() {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
+1
View File
@@ -10,6 +10,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_rain.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
static int daKytag13_Draw(kytag13_class* i_this) {
return 1;
+1
View File
@@ -9,6 +9,7 @@
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include <cstring>
static int daKytag15_Draw(kytag15_class* i_this) {
cXyz scale;
+1
View File
@@ -10,6 +10,7 @@
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include <cstring>
static int daKytag16_Draw(kytag16_class* i_this) {
return 1;
+1
View File
@@ -22,6 +22,7 @@
#include "d/d_s_play.h"
#include "d/d_vibration.h"
#include "f_op/f_op_kankyo_mng.h"
#include <cstring>
#define ANM_MG_FISH_MOUTH_CLOSE 4
#define ANM_MG_FISH_MOUTH_OPEN 5
+1
View File
@@ -23,6 +23,7 @@
#include "SSystem/SComponent/c_counter.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cmath>
#include <cstring>
class dmg_rod_HIO_c : public JORReflexible {
public:
+1
View File
@@ -20,6 +20,7 @@
#include "d/actor/d_a_movie_player.h"
#include "Z2AudioLib/Z2Instances.h"
#include "f_op/f_op_overlap_mng.h"
#include <cstring>
inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) {
return *(s32*)readBuf->ptr;
+1
View File
@@ -13,6 +13,7 @@
#include "d/actor/d_a_tag_myna_light.h"
#include "Z2AudioLib/Z2Instances.h"
#include "d/d_s_play.h"
#include <cstring>
static daMyna_c::ProcFunc init_proc[] = {
&daMyna_c::attack_wait_init,
+1
View File
@@ -14,6 +14,7 @@
#include "f_op/f_op_kankyo_mng.h"
#include "d/actor/d_a_mirror.h"
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include <cstring>
void daNbomb_c::coHitCallback(fopAc_ac_c* i_hitActor) {
if (fopAcM_GetGroup(i_hitActor) == fopAc_ENEMY_e ||
+1
View File
@@ -13,6 +13,7 @@
#include "c/c_damagereaction.h"
#include "Z2AudioLib/Z2Instances.h"
#include "f_op/f_op_camera_mng.h"
#include <cstring>
enum Joint {
/* 0x0 */ JNT_WAIST,
+1
View File
@@ -12,6 +12,7 @@
#include "f_op/f_op_camera_mng.h"
#include "f_op/f_op_kankyo_mng.h"
#include "m_Do/m_Do_lib.h"
#include <cstring>
#if DEBUG
void daNpcT_cmnListenPropertyEvent(char* param_0, int* param_1, daNpcT_HIOParam* param_2) {
+1
View File
@@ -17,6 +17,7 @@
#if DEBUG
#include "JSystem/JHostIO/JORFile.h"
#include "d/d_debug_viewer.h"
#include <cstring>
#endif
enum Aru_RES_File_ID {
+1
View File
@@ -10,6 +10,7 @@
#include "d/actor/d_a_tag_evtarea.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "SSystem/SComponent/c_math.h"
#include <cstring>
const daNpcAsh_HIOParam daNpcAsh_Param_c::m = {
35.0f, // attention_offset
+1
View File
@@ -8,6 +8,7 @@
#include "d/actor/d_a_npc_ashB.h"
#include "d/actor/d_a_npc.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include <cstring>
const daNpcAshB_HIOParam daNpcAshB_Param_c::m = {
205.0f, // attention_offset
+1
View File
@@ -11,6 +11,7 @@
#include "d/actor/d_a_tag_evtarea.h"
#include "d/actor/d_a_tag_kmsg.h"
#include "d/actor/d_a_npc_len.h"
#include <cstring>
enum Bans_RES_File_ID {
/* BCK */
+1
View File
@@ -13,6 +13,7 @@
#if DEBUG
#include "JSystem/JHostIO/JORFile.h"
#include "d/d_debug_viewer.h"
#include <cstring>
#endif
enum Besu_RES_File_ID {
+1
View File
@@ -11,6 +11,7 @@
#include "d/actor/d_a_npc_jagar.h"
#include "d/actor/d_a_tag_push.h"
#include "d/d_meter2_info.h"
#include <cstring>
static int l_bmdData[1][2] = {
{11, 1},
+27 -26
View File
@@ -12,6 +12,7 @@
#include "d/actor/d_a_npc_wrestler.h"
#include "Z2AudioLib/Z2Instances.h"
#include "d/d_camera.h"
#include <cstring>
enum Bou_RES_File_ID {
/* BCK */
@@ -1360,22 +1361,22 @@ int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) {
if (eventManager.getIsAddvance(i_staffId)) {
switch (*cutName) {
case '0x0001':
case '0001':
setLookMode(LOOK_PLAYER_TALK);
mActorMngrs[0].entry(daPy_getPlayerActorClass());
break;
case '0x0002':
case '0x0003':
case '0x0005':
case '0x0006':
case '0x0007':
case '0x0008':
case '0x0009':
case '0002':
case '0003':
case '0005':
case '0006':
case '0007':
case '0008':
case '0009':
initTalk(9, NULL);
break;
case '0x0004':
case '0004':
setExpressionAnm(ANM_FH_TALK_B, true);
break;
@@ -1396,17 +1397,17 @@ int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) {
}
switch (*cutName) {
case '0x0001':
case '0x0004':
case '0001':
case '0004':
return 1;
case '0x0002':
case '0x0003':
case '0x0005':
case '0x0006':
case '0x0007':
case '0x0008':
case '0x0009':
case '0002':
case '0003':
case '0005':
case '0006':
case '0007':
case '0008':
case '0009':
if (talkProc(NULL, TRUE, NULL)) {
s32 choiceNo = mFlow.getChoiceNo();
OS_REPORT("二択分岐 %s\n", choiceNo == 0 ? "はい" : "いいえ");
@@ -1434,7 +1435,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) {
if (eventManager.getIsAddvance(i_staffId)) {
switch (*cutName) {
case '0x0001':
case '0001':
initTalk(9, NULL);
setLookMode(LOOK_PLAYER_TALK);
mActorMngrs[0].entry(daPy_getPlayerActorClass());
@@ -1456,7 +1457,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) {
}
switch (*cutName) {
case '0x0001':
case '0001':
if (mCurAngle.y == fopAcM_searchPlayerAngleY(this)) {
if (talkProc(NULL, TRUE, NULL)) {
int choiceNo = mFlow.getChoiceNo();
@@ -1489,15 +1490,15 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) {
if (eventManager.getIsAddvance(i_staffId)) {
switch (*cutName) {
case '0x0001':
case '0001':
setLookMode(LOOK_PLAYER_TALK);
mActorMngrs[0].entry(daPy_getPlayerActorClass());
break;
case '0x0003':
case '0003':
setMotion(MOT_WALK, -1.0f, 0);
// fallthrough
case '0x0002':
case '0002':
setAngle(-0x2AAA);
initTalk(9, NULL);
break;
@@ -1521,16 +1522,16 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) {
}
switch (*cutName) {
case '0x0001':
case '0001':
return 1;
case '0x0002':
case '0002':
if (talkProc(NULL, TRUE, NULL)) {
return 1;
}
break;
case '0x0003': {
case '0003': {
cXyz* pos = dComIfGp_evmng_getMyXyzP(i_staffId, "pos");
if (pos != NULL) {
if (cLib_chaseAngleS(&shape_angle.y, cLib_targetAngleY(&current.pos, pos), 0x100)) {
+1
View File
@@ -2,6 +2,7 @@
#include "d/actor/d_a_npc_cd.h"
#include "d/actor/d_a_player.h"
#include <cstring>
static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
if (param_1 == 0) {
+1
View File
@@ -1,4 +1,5 @@
#include "d/actor/d_a_npc_cd2.h"
#include <cstring>
daNpcCd2_HIO_c::daNpcCd2_HIO_c() {
static daNpcCd2_HIO_Jnt_UnkStruct_s a_jntTbl_M[16][19] = {
+1
View File
@@ -8,6 +8,7 @@
#include "d/actor/d_a_npc_cdn3.h"
#include "d/d_msg_object.h"
#include "d/d_s_play.h"
#include <cstring>
const daNpcCdn3_c::ActionPair daNpcCdn3_c::ActionTable[8] = {
{&daNpcCdn3_c::initWait, &daNpcCdn3_c::executeWait},
+1
View File
@@ -7,6 +7,7 @@
#include "d/actor/d_a_npc_clerka.h"
#include "d/d_msg_object.h"
#include <cstring>
const daNpc_clerkA_HIOParam daNpc_clerkA_Param_c::m = {
220.0f, // attention_offset
+1
View File
@@ -7,6 +7,7 @@
#include "d/actor/d_a_npc_clerkb.h"
#include "d/d_msg_object.h"
#include <cstring>
const daNpc_clerkB_HIOParam daNpc_clerkB_Param_c::m = {
220.0f, // attention_offset
+1
View File
@@ -7,6 +7,7 @@
#include "d/actor/d_a_npc_clerkt.h"
#include "d/d_msg_object.h"
#include <cstring>
const daNpcClerkt_HIOParam daNpcClerkt_Param_c::m = {
120.0f, // attention_offset
+1
View File
@@ -13,6 +13,7 @@
#include "d/d_bg_w.h"
#include "d/d_meter2_info.h"
#include "d/d_tresure.h"
#include <cstring>
enum Coach_RES_File_ID {
/* BCK */
+1
View File
@@ -7,6 +7,7 @@
#include "d/actor/d_a_npc_doc.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
static int l_bmdData[1][2] = {
{14, 1},
+1
View File
@@ -9,6 +9,7 @@
#include "d/actor/d_a_npc4.h"
#include "d/d_s_play.h"
#include "JSystem/JHostIO/JORFile.h"
#include <cstring>
enum fairy_RES_File_ID {
/* BCK */
+1
View File
@@ -7,6 +7,7 @@
#include "d/actor/d_a_npc_fairy_seirei.h"
#include "d/actor/d_a_npc4.h"
#include <cstring>
static daNpcT_evtData_c l_evtList[1] = {
+1
View File
@@ -5,6 +5,7 @@
#include "d/actor/d_a_npc_fish.h"
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
#include <cstring>
static int daNpc_Fish_Draw(npc_fish_class* i_this) {
return 1;
+1
View File
@@ -6,6 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_gnd.h"
#include <cstring>
static int l_bmdData[1][2] = {
{11, 1},
+1
View File
@@ -12,6 +12,7 @@
#include "d/actor/d_a_npc_gra.h"
#include "d/actor/d_a_tag_gra.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
const daNpc_grA_HIOParam daNpc_grA_Param_c::m = {
{90.0f, -4.0f, 1.0f, 850.0f, 255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f,
+1
View File
@@ -8,6 +8,7 @@
#include "d/actor/d_a_npc_grc.h"
#include "d/actor/d_a_npc.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum grC_RES_File_ID {
/* BCK */
+1
View File
@@ -6,6 +6,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_npc_grm.h"
#include <cstring>
enum grA_Base_RES_File_ID {
/* BCK */
+1
View File
@@ -7,6 +7,7 @@
#include "d/actor/d_a_npc_grmc.h"
#include "d/actor/d_a_npc4.h"
#include <cstring>
enum grC_RES_File_ID {
/* BCK */
+1
View File
@@ -11,6 +11,7 @@
#include "d/d_debug_viewer.h"
#include "d/actor/d_a_tag_push.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum grO_RES_File_ID {
/* BCK */
+1
View File
@@ -8,6 +8,7 @@
#include "d/actor/d_a_npc_grr.h"
#include "d/actor/d_a_npc.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum grR_RES_File_ID {
/* BCK */

Some files were not shown because too many files have changed in this diff Show More