Skip to content

Commit 91185ef

Browse files
committed
cDirtyFileName and cDirtyTexName moved to M3UModelMario
1 parent 9990f00 commit 91185ef

19 files changed

Lines changed: 15 additions & 40 deletions

‎include/M3DUtil/M3UModelMario.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
#include <M3DUtil/M3UJoint.hpp>
66
#include <JSystem/J3D/J3DGraphAnimator/J3DJoint.hpp>
77

8+
static const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
9+
static const char cDirtyTexName[] = "H_ma_rak_dummy";
10+
811
class M3UMtxCalcSIAnmBlendQuat;
912

1013
class M3UModelCommonMario : public M3UModelCommon {

‎src/Camera/cameragc.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
#include <macros.h>
2121
#include <stdio.h>
2222

23-
const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
24-
const char cDirtyTexName[] = "H_ma_rak_dummy";
23+
#include <M3DUtil/M3UModelMario.hpp>
2524

2625
CPolarSubCamera* gpCamera;
2726

‎src/Enemy/emario.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
#include <MSound/MSSetSound.hpp>
2222
#include <MSound/MSoundBGM.hpp>
2323

24-
const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
25-
const char cDirtyTexName[] = "H_ma_rak_dummy";
24+
#include <M3DUtil/M3UModelMario.hpp>
2625

2726
TEMario::TEMario(const char* name)
2827
: TSpineEnemy(name)

‎src/Enemy/enemyMario.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
#include <MSound/MSSetSound.hpp>
4141
#include <MSound/MSoundBGM.hpp>
4242

43-
static const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
44-
static const char cDirtyTexName[] = "H_ma_rak_dummy";
45-
4643
#include <Player/MarioAnimeData.hpp>
4744

4845
static const TEnemyMario::TReplayLink replayLinkMonteMan[6] = {

‎src/Map/MapWarp.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <MSound/MSSetSound.hpp>
1313
#include <MSound/MSoundBGM.hpp>
1414
#include <M3DUtil/MActorAnm.hpp>
15+
#include <M3DUtil/M3UModelMario.hpp>
1516

1617
void TMapWarp::changeModel(int i)
1718
{

‎src/MoveBG/MapObjFence.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
#include <MSound/MSSetSound.hpp>
1919
#include <MSound/MSoundBGM.hpp>
2020

21-
static const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
22-
static const char cDirtyTexName[] = "H_ma_rak_dummy";
21+
#include <M3DUtil/M3UModelMario.hpp>
2322

2423
BOOL TFence::receiveMessage(THitActor* param_1, u32 param_2)
2524
{

‎src/Player/MarioCap.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
#include <JSystem/J3D/J3DGraphBase/J3DTexture.hpp>
55
#include <JSystem/J3D/J3DGraphBase/J3DMaterial.hpp>
66
#include <System/MarDirector.hpp>
7-
#include <M3DUtil/M3UModelMario.hpp>
87
#include <MarioUtil/DrawUtil.hpp>
98
#include <MarioUtil/TexUtil.hpp>
109
#include <MarioUtil/PacketUtil.hpp>
1110

1211
// rogue includes needed for matching sinit & bss
1312
#include <System/Application.hpp>
14-
15-
const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
16-
const char cDirtyTexName[] = "H_ma_rak_dummy";
13+
#include <M3DUtil/M3UModelMario.hpp>
1714

1815
TMarioCap::TMarioCap(TMario* mario)
1916
{

‎src/Player/MarioDraw.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232

3333
TMario* gpMarioForCallBack;
3434

35-
const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
36-
const char cDirtyTexName[] = "H_ma_rak_dummy";
37-
3835
// clang-format off
3936
TMarioAnimeData gMarioAnimeData[336] = {
4037
/* 0x00 */ { 0x00, 0x00C8, 0x00, 0x01, 0x04, 0x16 }, // hgup

‎src/Player/MarioEffect.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#include <MSound/MSSetSound.hpp>
1717
#include <MSound/MSoundBGM.hpp>
1818

19-
static const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
20-
static const char cDirtyTexName[] = "H_ma_rak_dummy";
19+
#include <M3DUtil/M3UModelMario.hpp>
2120

2221
void TMarioEffect::init(TMario* mario)
2322
{

‎src/Player/MarioInit.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ bool SMS_isMultiPlayerMap();
2020
static JGeometry::TVec3<f32> cDeformedTerrainCenter(0.0f, 5000.0f, 0.0f);
2121
#include <System/Application.hpp>
2222

23-
const char cDirtyFileName[] = "/scene/map/pollution/H_ma_rak.bti";
24-
const char cDirtyTexName[] = "H_ma_rak_dummy";
25-
2623
TMario::TMario()
2724
: TTakeActor("HitActor")
2825
, mYoshi(nullptr)

0 commit comments

Comments
 (0)