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

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2016-06-07 18:38:41 -10:00
parent 384f660efc 56320d2442
commit f557db39fe
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/DNACommon/CRSC.cpp
View File

@ -65,7 +65,7 @@ static const std::vector<FourCC> DecalTypes =
SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'), SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'),
SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'), SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'),
SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'), SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'),
SBIG('CHDL'),SBIG('ENDL') SBIG('CHDL')
}; };

2
DataSpec/DNACommon/DGRP.hpp
View File

@ -17,7 +17,7 @@ struct DGRP : BigYAML
{ {
DECL_YAML DECL_YAML
DNAFourCC type; DNAFourCC type;
UniqueID32 id; IDType id;
}; };
Vector<ObjectTag, DNA_COUNT(dependCount)> depends; Vector<ObjectTag, DNA_COUNT(dependCount)> depends;

4
Runtime/Particle/CCollisionResponseData.cpp
View File

@ -62,14 +62,14 @@ static const std::vector<FourCC> GeneratorTypes =
SBIG('3SVA'),SBIG('3RPR'),SBIG('3MTR'),SBIG('3PDS'), SBIG('3SVA'),SBIG('3RPR'),SBIG('3MTR'),SBIG('3PDS'),
SBIG('3FLB'),SBIG('3DRN'),SBIG('3MRE'),SBIG('CHSH'), SBIG('3FLB'),SBIG('3DRN'),SBIG('3MRE'),SBIG('CHSH'),
SBIG('JZSH'),SBIG('5ISE'),SBIG('5BSE'),SBIG('5ATB'), SBIG('JZSH'),SBIG('5ISE'),SBIG('5BSE'),SBIG('5ATB'),
SBIG('5ATA'), SBIG('5ATA')
}; };
static const std::vector<FourCC> DecalTypes = static const std::vector<FourCC> DecalTypes =
{ {
SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'), SBIG('NCDL'),SBIG('DDCL'),SBIG('CODL'),SBIG('MEDL'),
SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'), SBIG('GRDL'),SBIG('ICDL'),SBIG('GODL'),SBIG('WODL'),
SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'), SBIG('WTDL'),SBIG('3MUD'),SBIG('3LAV'),SBIG('3SAN'),
SBIG('CHDL'),SBIG('ENDL') SBIG('CHDL')
}; };
using CPF = CParticleDataFactory; using CPF = CParticleDataFactory;

2
Runtime/Particle/CCollisionResponseData.hpp
View File

@ -16,7 +16,7 @@ class CDecalDescription;
enum class EWeaponCollisionResponseTypes enum class EWeaponCollisionResponseTypes
{ {
Unknown0, Unknown1, Metal, Grass, Default, Unknown1, Metal, Grass,
Ice, Goo, Wood, Water, Ice, Goo, Wood, Water,
Mud, Lava, Sand,Unknown11, Mud, Lava, Sand,Unknown11,
Unknown12,Unknown13,Unknown14,Unknown15, Unknown12,Unknown13,Unknown14,Unknown15,