AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Complete merge

This commit is contained in:
Jack Andersen 2016-09-16 10:23:07 -10:00
parent 32be061783
commit dae5ea06f5
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataSpec/SpecMP1.cpp
View File

@ -22,12 +22,9 @@
#include "DNACommon/Tweaks/TweakWriter.hpp" #include "DNACommon/Tweaks/TweakWriter.hpp"
#include "DNAMP1/Tweaks/CTweakPlayerRes.hpp" #include "DNAMP1/Tweaks/CTweakPlayerRes.hpp"
#include "DNAMP1/Tweaks/CTweakGunRes.hpp" #include "DNAMP1/Tweaks/CTweakGunRes.hpp"
<<<<<<< HEAD
#include "DNAMP1/Tweaks/CTweakSlideShow.hpp" #include "DNAMP1/Tweaks/CTweakSlideShow.hpp"
=======
#include "DNAMP1/Tweaks/CTweakPlayer.hpp" #include "DNAMP1/Tweaks/CTweakPlayer.hpp"
#include "DNAMP1/Tweaks/CTweakCameraBob.hpp" #include "DNAMP1/Tweaks/CTweakCameraBob.hpp"
>>>>>>> b27821c5eb1c9eb5b69acda11ab77c7cda018ca9
#include "hecl/ClientProcess.hpp" #include "hecl/ClientProcess.hpp"
@ -360,13 +357,11 @@ struct SpecMP1 : SpecBase
return true; return true;
else if (!strcmp(classType, DNAMP1::CTweakGunRes::DNAType())) else if (!strcmp(classType, DNAMP1::CTweakGunRes::DNAType()))
return true; return true;
<<<<<<< HEAD
else if (!strcmp(classType, DNAMP1::CTweakSlideShow::DNAType())) else if (!strcmp(classType, DNAMP1::CTweakSlideShow::DNAType()))
======= return true;
else if (!strcmp(classType, DNAMP1::CTweakPlayer::DNAType())) else if (!strcmp(classType, DNAMP1::CTweakPlayer::DNAType()))
return true; return true;
else if (!strcmp(classType, DNAMP1::CTweakCameraBob::DNAType())) else if (!strcmp(classType, DNAMP1::CTweakCameraBob::DNAType()))
>>>>>>> b27821c5eb1c9eb5b69acda11ab77c7cda018ca9
return true; return true;
else if (!strcmp(classType, DNAMP1::HINT::DNAType())) else if (!strcmp(classType, DNAMP1::HINT::DNAType()))
return true; return true;
@ -526,6 +521,7 @@ struct SpecMP1 : SpecBase
DNAMP1::CTweakSlideShow slideShow; DNAMP1::CTweakSlideShow slideShow;
slideShow.read(reader); slideShow.read(reader);
WriteTweak(slideShow, out); WriteTweak(slideShow, out);
}
else if (!classStr.compare(DNAMP1::CTweakPlayer::DNAType())) else if (!classStr.compare(DNAMP1::CTweakPlayer::DNAType()))
{ {
DNAMP1::CTweakPlayer player; DNAMP1::CTweakPlayer player;

3
Runtime/MP1/CTweaks.cpp
View File

@ -10,11 +10,8 @@
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakGunRes.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakPlayerRes.hpp"
<<<<<<< HEAD
#include "DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp" #include "DataSpec/DNAMP1/Tweaks/CTweakSlideShow.hpp"
=======
#include "World/CPlayerCameraBob.hpp" #include "World/CPlayerCameraBob.hpp"
>>>>>>> b27821c5eb1c9eb5b69acda11ab77c7cda018ca9
namespace urde namespace urde
{ {