mirror of
https://github.com/zeldaret/tww.git
synced 2026-06-23 08:39:56 -04:00
Minor fixes
This commit is contained in:
+5
-5
@@ -277,7 +277,7 @@ config.libs = [
|
||||
Object(NonMatching, "f_ap/f_ap_game.cpp"),
|
||||
|
||||
# f_op
|
||||
Object(Matching, "f_op/f_op_actor.cpp", extra_cflags=["-sym off"]),
|
||||
Object(Matching, "f_op/f_op_actor.cpp", extra_cflags=['-pragma "nosyminline on"']),
|
||||
Object(Matching, "f_op/f_op_actor_iter.cpp"),
|
||||
Object(Matching, "f_op/f_op_actor_tag.cpp"),
|
||||
Object(NonMatching, "f_op/f_op_actor_mng.cpp"),
|
||||
@@ -1251,7 +1251,7 @@ config.libs = [
|
||||
ActorRel(NonMatching, "d_a_msw"),
|
||||
ActorRel(NonMatching, "d_a_mtoge"),
|
||||
ActorRel(NonMatching, "d_a_obj_AjavW"),
|
||||
ActorRel(Matching, "d_a_obj_Ygush00", extra_cflags=["-sym off"]),
|
||||
ActorRel(Matching, "d_a_obj_Ygush00", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_obj_akabe"),
|
||||
ActorRel(NonMatching, "d_a_obj_barrel"),
|
||||
ActorRel(NonMatching, "d_a_obj_barrel2"),
|
||||
@@ -1263,7 +1263,7 @@ config.libs = [
|
||||
ActorRel(NonMatching, "d_a_obj_doguu_demo"),
|
||||
ActorRel(NonMatching, "d_a_obj_gryw00"),
|
||||
ActorRel(NonMatching, "d_a_obj_hfuck1"),
|
||||
ActorRel(Matching, "d_a_obj_hole", extra_cflags=["-sym off"]),
|
||||
ActorRel(Matching, "d_a_obj_hole", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_obj_ice"),
|
||||
ActorRel(NonMatching, "d_a_obj_ikada"),
|
||||
ActorRel(NonMatching, "d_a_obj_kanat"),
|
||||
@@ -1326,7 +1326,7 @@ config.libs = [
|
||||
ActorRel(NonMatching, "d_a_wbird"),
|
||||
ActorRel(NonMatching, "d_a_ykgr"),
|
||||
ActorRel(Matching, "d_a_alldie"),
|
||||
ActorRel(Matching, "d_a_am", extra_cflags=["-sym off"]),
|
||||
ActorRel(Matching, "d_a_am", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(Matching, "d_a_am2", extra_cflags=["-sym off"]),
|
||||
ActorRel(NonMatching, "d_a_amiprop"),
|
||||
ActorRel(NonMatching, "d_a_arrow_iceeff"),
|
||||
@@ -1603,7 +1603,7 @@ config.libs = [
|
||||
ActorRel(NonMatching, "d_a_tag_etc"),
|
||||
ActorRel(NonMatching, "d_a_tag_island"),
|
||||
ActorRel(NonMatching, "d_a_tag_kf1"),
|
||||
ActorRel(Matching, "d_a_tag_ret", extra_cflags=["-sym off"]),
|
||||
ActorRel(Matching, "d_a_tag_ret", extra_cflags=['-pragma "nosyminline on"']),
|
||||
ActorRel(NonMatching, "d_a_tag_volcano"),
|
||||
ActorRel(NonMatching, "d_a_title"),
|
||||
ActorRel(NonMatching, "d_a_tn"),
|
||||
|
||||
@@ -598,7 +598,8 @@ struct J3DBlend : public J3DBlendInfo {
|
||||
extern const J3DFogInfo j3dDefaultFogInfo;
|
||||
|
||||
struct J3DFog : public J3DFogInfo {
|
||||
J3DFog() { *getFogInfo() = j3dDefaultFogInfo; }
|
||||
// J3DFog() { *getFogInfo() = j3dDefaultFogInfo; } // Produces the wrong codegen for mDoExt_backupMatBlock_c's constructor
|
||||
J3DFog() { J3DFogInfo::operator=(j3dDefaultFogInfo); }
|
||||
J3DFogInfo* getFogInfo() { return (J3DFogInfo*)this; }
|
||||
|
||||
void load() {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
#include "d/d_npc.h"
|
||||
#include "d/d_bg_s_lin_chk.h"
|
||||
#include "d/d_drawlist.h"
|
||||
|
||||
class daNpc_Md_HIO2_c {
|
||||
public:
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
//
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/actor/d_a_obj_pirateship.h"
|
||||
#include "d/actor/d_a_agb.h"
|
||||
#include "d/actor/d_a_agbsw0.h"
|
||||
|
||||
Reference in New Issue
Block a user