mirror of
https://github.com/zeldaret/tww.git
synced 2026-09-03 18:03:42 -04:00
Fix weak function order of dBgS_MoveBgActor::Draw
fixes #217 fixes #239 fixes #389 fixes #418 fixes #428 fixes #147
This commit is contained in:
@@ -2,8 +2,6 @@
|
||||
#define D_A_HYS_H
|
||||
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
|
||||
class daHys_c : public dBgS_MoveBgActor {
|
||||
public:
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
#ifndef D_A_OBJ_ESKBAN_H
|
||||
#define D_A_OBJ_ESKBAN_H
|
||||
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
#include "d/d_a_obj.h"
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "d/d_particle.h"
|
||||
|
||||
namespace daObjEskban {
|
||||
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
#ifndef D_A_OBJ_LADDER_H
|
||||
#define D_A_OBJ_LADDER_H
|
||||
|
||||
#include "d/d_a_obj.h"
|
||||
#include "d/d_bg_s_gnd_chk.h"
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "d/d_bg_s_gnd_chk.h"
|
||||
|
||||
namespace daObjLadder {
|
||||
enum Type_e {
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
#ifndef D_A_OBJ_MOVEBOX_H
|
||||
#define D_A_OBJ_MOVEBOX_H
|
||||
|
||||
#include "d/d_a_obj.h"
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "d/d_bg_s_gnd_chk.h"
|
||||
#include "d/d_bg_s_wtr_chk.h"
|
||||
#include "d/d_bg_s_lin_chk.h"
|
||||
#include "d/d_particle.h"
|
||||
#include "d/d_bg_w.h"
|
||||
#include "d/d_path.h"
|
||||
|
||||
struct dPath;
|
||||
|
||||
namespace daObjMovebox {
|
||||
class Act_c;
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
#ifndef D_A_OBJ_MTEST_H
|
||||
#define D_A_OBJ_MTEST_H
|
||||
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_a_obj.h"
|
||||
|
||||
namespace daObjMtest {
|
||||
class Act_c : public dBgS_MoveBgActor {
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
#ifndef D_A_OBJ_SWHAMMER_H
|
||||
#define D_A_OBJ_SWHAMMER_H
|
||||
|
||||
#include "d/d_a_obj.h"
|
||||
#include "d/d_bg_s_movebg_actor.h"
|
||||
#include "d/d_particle.h"
|
||||
|
||||
class J3DNode;
|
||||
|
||||
|
||||
@@ -3,6 +3,13 @@
|
||||
|
||||
#include "SSystem/SComponent/c_bg_s_poly_info.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
// Fakematch to fix weak func order/.text section splitting of some TUs that include this header.
|
||||
// Some affected TUs: d_a_hys, d_a_obj_swhammer, d_a_obj_eskban, d_a_obj_mtest, d_a_obj_movebox.
|
||||
#pragma push
|
||||
#pragma sym off
|
||||
#include "d/d_a_obj.h"
|
||||
#include "d/d_particle.h"
|
||||
#pragma pop
|
||||
|
||||
class dBgW;
|
||||
typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo&, bool, cXyz*, csXyz*, csXyz*);
|
||||
|
||||
Reference in New Issue
Block a user