Changed over to new FOURCC macro

resources/gameinfo/GameInfoMP2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<GameInfo ArchiveVer="0" FileVer="0" Game="MPRM">
+<GameInfo ArchiveVer="0" FileVer="0" Game="MP2E">
     <GameBuilds>
         <Build>
             <Version>0.160</Version>

src/Common/CFourCC.h

@@ -7,11 +7,10 @@
 #include <FileIO/IInputStream.h>
 #include <FileIO/IOutputStream.h>
 
-#define FOURCC(Text) (Text[0] << 24 | Text[1] << 16 | Text[2] << 8 | Text[3])
+#define FOURCC_FROM_TEXT(Text) (Text[0] << 24 | Text[1] << 16 | Text[2] << 8 | Text[3])
-#define FOURCC_CONSTEXPR(A, B, C, D) (A << 24 | B << 16 | C << 8 | D)
+
-// todo: replace usages of FOURCC and FOURCC_CONSTEXPR with this macro
+// Note: All FourCC constants should be wrapped in this macro
-// (it should be renamed to just FOURCC when the others aren't in use anymore)
+#define FOURCC(Value) Value
-#define IFOURCC(Value) Value
 
 class CFourCC
 {
@@ -25,9 +24,9 @@ class CFourCC
 public:
     // Constructors
     inline CFourCC()                        { mFourCC = 0; }
-    inline CFourCC(const char *pkSrc)       { mFourCC = FOURCC(pkSrc); }
+    inline CFourCC(const char *pkSrc)       { mFourCC = FOURCC_FROM_TEXT(pkSrc); }
-    inline CFourCC(const TString& rkSrc)    { ASSERT(rkSrc.Length() == 4); mFourCC = FOURCC(rkSrc); }
+    inline CFourCC(const TString& rkSrc)    { ASSERT(rkSrc.Length() == 4); mFourCC = FOURCC_FROM_TEXT(rkSrc); }
-    inline CFourCC(const TWideString& rkSrc){ ASSERT(rkSrc.Length() == 4); mFourCC = FOURCC(rkSrc); }
+    inline CFourCC(const TWideString& rkSrc){ ASSERT(rkSrc.Length() == 4); mFourCC = FOURCC_FROM_TEXT(rkSrc); }
     inline CFourCC(u32 Src)                 { mFourCC = Src; }
     inline CFourCC(IInputStream& rSrc)      { Read(rSrc); }
 
@@ -116,8 +115,8 @@ public:
         return rkStr + rkFourCC.ToString();
     }
 
-    inline CFourCC& operator=(const char *pkSrc)            { mFourCC = FOURCC(pkSrc);  return *this;   }
+    inline CFourCC& operator=(const char *pkSrc)            { mFourCC = FOURCC_FROM_TEXT(pkSrc);    return *this;   }
-    inline CFourCC& operator=(const TString& rkSrc)         { mFourCC = FOURCC(rkSrc);  return *this;   }
+    inline CFourCC& operator=(const TString& rkSrc)         { mFourCC = FOURCC_FROM_TEXT(rkSrc);    return *this;   }
     inline CFourCC& operator=(u32 Src)                      { mFourCC = Src;                        return *this;   }
     inline bool operator==(const CFourCC& rkOther) const    { return mFourCC == rkOther.mFourCC;                    }
     inline bool operator!=(const CFourCC& rkOther) const    { return mFourCC != rkOther.mFourCC;                    }

src/Core/Core.pro

@@ -204,7 +204,6 @@ HEADERS += \
     Resource/Factory/CDependencyGroupLoader.h \
     GameProject/CDependencyTree.h \
     Resource/Factory/CUnsupportedFormatLoader.h \
-    Resource/ParticleParameters.h \
     Resource/Factory/CUnsupportedParticleLoader.h \
     Resource/Resources.h \
     Resource/Factory/CResourceFactory.h \

src/Core/GameProject/AssetNameGeneration.cpp

@@ -267,7 +267,7 @@ void GenerateAssetNames(CGameProject *pProj)
                 {
                     CScriptObject *pInst = pLayer->InstanceByIndex(iInst);
 
-                    if (pInst->ObjectTypeID() == 0x42 || pInst->ObjectTypeID() == FOURCC("POIN"))
+                    if (pInst->ObjectTypeID() == 0x42 || pInst->ObjectTypeID() == FOURCC('POIN'))
                     {
                         TString Name = pInst->InstanceName();
 
@@ -302,7 +302,7 @@ void GenerateAssetNames(CGameProject *pProj)
                         }
                     }
 
-                    else if (pInst->ObjectTypeID() == 0x17 || pInst->ObjectTypeID() == FOURCC("MEMO"))
+                    else if (pInst->ObjectTypeID() == 0x17 || pInst->ObjectTypeID() == FOURCC('MEMO'))
                     {
                         TString Name = pInst->InstanceName();
 
@@ -331,8 +331,8 @@ void GenerateAssetNames(CGameProject *pProj)
                     }
 
                     // Look for lightmapped models - these are going to be unique to this area
-                    else if (pInst->ObjectTypeID() == 0x0 || pInst->ObjectTypeID() == FOURCC("ACTR") ||
+                    else if (pInst->ObjectTypeID() == 0x0 || pInst->ObjectTypeID() == FOURCC('ACTR') ||
-                             pInst->ObjectTypeID() == 0x8 || pInst->ObjectTypeID() == FOURCC("PLAT"))
+                             pInst->ObjectTypeID() == 0x8 || pInst->ObjectTypeID() == FOURCC('PLAT'))
                     {
                         u32 ModelPropID = (pProj->Game() <= ePrime ? (pInst->ObjectTypeID() == 0x0 ? 0xA : 0x6) : 0xC27FFA8F);
                         TAssetProperty *pModelProperty = TPropCast<TAssetProperty>(pInst->Properties()->PropertyByID(ModelPropID));

src/Core/GameProject/CDependencyTree.h

@@ -16,15 +16,15 @@ struct SSetCharacter;
 // Group of node classes forming a tree of cached resource dependencies.
 enum EDependencyNodeType
 {
-    eDNT_DependencyTree     = FOURCC_CONSTEXPR('T', 'R', 'E', 'E'),
+    eDNT_DependencyTree     = FOURCC('TREE'),
-    eDNT_ResourceDependency = FOURCC_CONSTEXPR('R', 'S', 'D', 'P'),
+    eDNT_ResourceDependency = FOURCC('RSDP'),
-    eDNT_ScriptInstance     = FOURCC_CONSTEXPR('S', 'C', 'I', 'N'),
+    eDNT_ScriptInstance     = FOURCC('SCIN'),
-    eDNT_ScriptProperty     = FOURCC_CONSTEXPR('S', 'C', 'P', 'R'),
+    eDNT_ScriptProperty     = FOURCC('SCPR'),
-    eDNT_CharacterProperty  = FOURCC_CONSTEXPR('C', 'R', 'P', 'R'),
+    eDNT_CharacterProperty  = FOURCC('CRPR'),
-    eDNT_SetCharacter       = FOURCC_CONSTEXPR('S', 'C', 'H', 'R'),
+    eDNT_SetCharacter       = FOURCC('SCHR'),
-    eDNT_SetAnimation       = FOURCC_CONSTEXPR('S', 'A', 'N', 'M'),
+    eDNT_SetAnimation       = FOURCC('SANM'),
-    eDNT_AnimEvent          = FOURCC_CONSTEXPR('E', 'V', 'N', 'T'),
+    eDNT_AnimEvent          = FOURCC('EVNT'),
-    eDNT_Area               = FOURCC_CONSTEXPR('A', 'R', 'E', 'A'),
+    eDNT_Area               = FOURCC('AREA'),
 };
 
 // Base class providing an interface for a basic dependency node.

src/Core/GameProject/DependencyListBuilders.cpp

@@ -308,7 +308,7 @@ void CPackageDependencyListBuilder::EvaluateDependencyNode(CResourceEntry *pCurE
         if (Type == eDNT_ScriptInstance)
         {
             u32 ObjType = static_cast<CScriptInstanceDependency*>(pNode)->ObjectType();
-            mIsPlayerActor = (ObjType == 0x4C || ObjType == FOURCC("PLAC"));
+            mIsPlayerActor = (ObjType == 0x4C || ObjType == FOURCC('PLAC'));
         }
 
         for (u32 iChild = 0; iChild < pNode->NumChildren(); iChild++)
@@ -349,7 +349,7 @@ void CAreaDependencyListBuilder::BuildDependencyList(std::list<CAssetID>& rAsset
         {
             CScriptInstanceDependency *pInst = static_cast<CScriptInstanceDependency*>(pTree->ChildByIndex(iChild));
             ASSERT(pInst->Type() == eDNT_ScriptInstance);
-            mIsPlayerActor = (pInst->ObjectType() == 0x4C || pInst->ObjectType() == FOURCC("PLAC"));
+            mIsPlayerActor = (pInst->ObjectType() == 0x4C || pInst->ObjectType() == FOURCC('PLAC'));
 
             for (u32 iDep = 0; iDep < pInst->NumChildren(); iDep++)
             {

src/Core/Resource/Factory/CUnsupportedFormatLoader.cpp

@@ -1,6 +1,5 @@
 #include "CUnsupportedFormatLoader.h"
 #include "Core/GameProject/CGameProject.h"
-#include "Core/Resource/ParticleParameters.h"
 
 CDependencyGroup* CUnsupportedFormatLoader::LoadCSNG(IInputStream& rCSNG, CResourceEntry *pEntry)
 {
@@ -16,7 +15,7 @@ CDependencyGroup* CUnsupportedFormatLoader::LoadCSNG(IInputStream& rCSNG, CResou
 CDependencyGroup* CUnsupportedFormatLoader::LoadDUMB(IInputStream& rDUMB, CResourceEntry *pEntry)
 {
     // Check for HIER, which needs special handling
-    if (CFourCC(rDUMB.PeekLong()) == "HIER")
+    if (rDUMB.PeekLong() == FOURCC('HIER'))
         return LoadHIER(rDUMB, pEntry);
 
     // Load other DUMB file. DUMB files don't have a set format - they're different between different files
@@ -199,7 +198,7 @@ CDependencyGroup* CUnsupportedFormatLoader::LoadFRME(IInputStream& rFRME, CResou
 CDependencyGroup* CUnsupportedFormatLoader::LoadFSM2(IInputStream& rFSM2, CResourceEntry *pEntry)
 {
     u32 Magic = rFSM2.ReadLong();
-    ASSERT(Magic == FOURCC("FSM2"));
+    ASSERT(Magic == FOURCC('FSM2'));
 
     CDependencyGroup *pOut = new CDependencyGroup(pEntry);
     u32 Version = rFSM2.ReadLong();
@@ -381,7 +380,7 @@ CDependencyGroup* CUnsupportedFormatLoader::LoadRULE(IInputStream& rRULE, CResou
 {
     // RULE files can contain a reference to another RULE file, but has no other dependencies.
     u32 Magic = rRULE.ReadLong();
-    ASSERT(CFourCC(Magic) == "RULE");
+    ASSERT(Magic == FOURCC('RULE'));
 
     CDependencyGroup *pGroup = new CDependencyGroup(pEntry);
     rRULE.Seek(0x1, SEEK_CUR);

src/Core/Resource/Factory/CUnsupportedParticleLoader.h

@@ -2,7 +2,6 @@
 #define CUNSUPPORTEDPARTICLELOADER_H
 
 #include "Core/Resource/CDependencyGroup.h"
-#include "Core/Resource/ParticleParameters.h"
 
 // This class is responsible for loading particle formats that aren't yet fully supported.
 // Used for finding dependencies. Split from CUnsupportedFormatLoader for being too big.

src/Core/Resource/ParticleParameters.h

@@ -1,536 +0,0 @@
-#ifndef PARTICLEPARAMETERS
-#define PARTICLEPARAMETERS
-
-#include <Common/CFourCC.h>
-
-// ************ PARTICLE PARAMETERS ************
-// This setup kinda sucks but it was the best way I found that wouldn't take a ton of work, works well with the
-// temp particle parser, and compiles. This can probably be done better with actual particle support, by just
-// defining classes for each parameter/function that can dynamically look up their parameters, and then that could
-// be used by the loader instead of needing constant expressions and switch statements.
-#define PARAMS_BEGIN enum {
-#define PARAMS_END kParticleParamsMax };
-#define PARAM(ParticleType, ParamName, CharA, CharB, CharC, CharD) k##ParticleType##ParamName = FOURCC_CONSTEXPR(CharA, CharB, CharC, CharD),
-
-PARAMS_BEGIN
-PARAM(Param, END, '_', 'E', 'N', 'D')
-// Parameters (PART)
-PARAM(Gen, AAPH, 'A','A','P','H') // Bool
-PARAM(Gen, ADV1, 'A','D','V','1') // Float
-PARAM(Gen, ADV2, 'A','D','V','2') // Float
-PARAM(Gen, ADV3, 'A','D','V','3') // Float
-PARAM(Gen, ADV4, 'A','D','V','4') // Float
-PARAM(Gen, ADV5, 'A','D','V','5') // Float
-PARAM(Gen, ADV6, 'A','D','V','6') // Float
-PARAM(Gen, ADV7, 'A','D','V','7') // Float
-PARAM(Gen, ADV8, 'A','D','V','8') // Float
-PARAM(Gen, ADV9, 'A','D','V','9') // Float
-PARAM(Gen, CIND, 'C', 'I', 'N', 'D') // Bool
-PARAM(Gen, COLR, 'C', 'O', 'L', 'R') // Color
-PARAM(Gen, CSSD, 'C', 'S', 'S', 'D') // Int
-PARAM(Gen, DFLG, 'D', 'F', 'L', 'G') // Bitfield
-PARAM(Gen, EMTR, 'E', 'M', 'T', 'R') // Emitter
-PARAM(Gen, FXBO, 'F', 'X', 'B', 'O') // Vector
-PARAM(Gen, FXBR, 'F', 'X', 'B', 'R') // Float
-PARAM(Gen, FXLL, 'F', 'X', 'L', 'L') // Bool
-PARAM(Gen, GRTE, 'G', 'R', 'T', 'E') // Float
-PARAM(Gen, ICTS, 'I', 'C', 'T', 'S') // Asset (PART)
-PARAM(Gen, IDTS, 'I', 'D', 'T', 'S') // Asset (PART)
-PARAM(Gen, IITS, 'I', 'I', 'T', 'S') // Asset (PART)
-PARAM(Gen, ILOC, 'I', 'L', 'O', 'C') // Vector
-PARAM(Gen, INDM, 'I', 'N', 'D', 'M') // Bool
-PARAM(Gen, IVEC, 'I', 'V', 'E', 'C') // Vector
-PARAM(Gen, KSSM, 'K', 'S', 'S', 'M') // SpawnSystemKeyframeData
-PARAM(Gen, LCLR, 'L', 'C', 'L', 'R') // Color
-PARAM(Gen, LDIR, 'L', 'D', 'I', 'R') // Vector
-PARAM(Gen, LENG, 'L', 'E', 'N', 'G') // Float
-PARAM(Gen, LFOR, 'L', 'F', 'O', 'R') // Float
-PARAM(Gen, LFOT, 'L', 'F', 'O', 'T') // Int
-PARAM(Gen, LINE, 'L', 'I', 'N', 'E') // Bool
-PARAM(Gen, LINT, 'L', 'I', 'N', 'T') // Float
-PARAM(Gen, LIT_, 'L', 'I', 'T', '_') // Bool
-PARAM(Gen, LOFF, 'L', 'O', 'F', 'F') // Vector
-PARAM(Gen, LSLA, 'L', 'S', 'L', 'A') // Float
-PARAM(Gen, LTME, 'L', 'T', 'M', 'E') // Int
-PARAM(Gen, LTYP, 'L', 'T', 'Y', 'P') // Int
-PARAM(Gen, MAXP, 'M', 'A', 'X', 'P') // Int
-PARAM(Gen, MBLR, 'M', 'B', 'L', 'R') // Bool
-PARAM(Gen, MBSP, 'M', 'B', 'S', 'P') // Int
-PARAM(Gen, NCSY, 'N', 'C', 'S', 'Y') // Int
-PARAM(Gen, NDSY, 'N', 'D', 'S', 'Y') // Int
-PARAM(Gen, OPTS, 'O', 'P', 'T', 'S') // Bool
-PARAM(Gen, ORNT, 'O', 'R', 'N', 'T') // Bool
-PARAM(Gen, PISY, 'P', 'I', 'S', 'Y') // Int
-PARAM(Gen, PMAB, 'P', 'M', 'A', 'B') // Bool
-PARAM(Gen, PMCL, 'P', 'M', 'C', 'L') // Color
-PARAM(Gen, PMDL, 'P', 'M', 'D', 'L') // Asset (CMDL)
-PARAM(Gen, PMOO, 'P', 'M', 'O', 'O') // Bool
-PARAM(Gen, PMOP, 'P', 'M', 'O', 'P') // Vector
-PARAM(Gen, PMOV, 'P', 'M', 'O', 'V') // Vector
-PARAM(Gen, PMRT, 'P', 'M', 'R', 'T') // Vector
-PARAM(Gen, PMSC, 'P', 'M', 'S', 'C') // Vector
-PARAM(Gen, PMUS, 'P', 'M', 'U', 'S') // Bool
-PARAM(Gen, POFS, 'P', 'O', 'F', 'S') // Vector
-PARAM(Gen, PSIV, 'P', 'S', 'I', 'V') // Int
-PARAM(Gen, PSLT, 'P', 'S', 'L', 'T') // Int
-PARAM(Gen, PSOV, 'P', 'S', 'O', 'V') // Vector
-PARAM(Gen, PSTS, 'P', 'S', 'T', 'S') // Float
-PARAM(Gen, PSVM, 'P', 'S', 'V', 'M') // Mod Vector
-PARAM(Gen, PSWT, 'P', 'S', 'W', 'T') // Int
-PARAM(Gen, RDOP, 'R', 'D', 'O', 'P') // Bool
-PARAM(Gen, ROTA, 'R', 'O', 'T', 'A') // Float
-PARAM(Gen, RSOP, 'R', 'S', 'O', 'P') // Bool
-PARAM(Gen, SEED, 'S', 'E', 'E', 'D') // Int
-PARAM(Gen, SELC, 'S', 'E', 'L', 'C') // Asset (ELSC)
-PARAM(Gen, SEPO, 'S', 'E', 'P', 'O') // Vector
-PARAM(Gen, SESD, 'S', 'E', 'S', 'D') // Int
-PARAM(Gen, SISY, 'S', 'I', 'S', 'Y') // Int
-PARAM(Gen, SIZE, 'S', 'I', 'Z', 'E') // Float
-PARAM(Gen, SORT, 'S', 'O', 'R', 'T') // Bool
-PARAM(Gen, SSPO, 'S', 'S', 'P', 'O') // Vector
-PARAM(Gen, SSSD, 'S', 'S', 'S', 'D') // Int
-PARAM(Gen, SSWH, 'S', 'S', 'W', 'H') // Asset (SWHC)
-PARAM(Gen, TEXR, 'T', 'E', 'X', 'R') // UV
-PARAM(Gen, TIND, 'T', 'I', 'N', 'D') // UV
-PARAM(Gen, VAV1, 'V', 'A', 'V', '1') // Vector
-PARAM(Gen, VAV2, 'V', 'A', 'V', '2') // Vector
-PARAM(Gen, VAV3, 'V', 'A', 'V', '3') // Vector
-PARAM(Gen, VEL1, 'V', 'E', 'L', '1') // Mod Vector
-PARAM(Gen, VEL2, 'V', 'E', 'L', '2') // Mod Vector
-PARAM(Gen, VEL3, 'V', 'E', 'L', '3') // Mod Vector
-PARAM(Gen, VEL4, 'V', 'E', 'L', '4') // Mod Vector
-PARAM(Gen, VMD1, 'V', 'M', 'D', '1') // Bool
-PARAM(Gen, VMD2, 'V', 'M', 'D', '2') // Bool
-PARAM(Gen, VMD3, 'V', 'M', 'D', '3') // Bool
-PARAM(Gen, VMD4, 'V', 'M', 'D', '4') // Bool
-PARAM(Gen, VMPC, 'V', 'M', 'P', 'C') // Bool
-PARAM(Gen, WIDT, 'W', 'I', 'D', 'T') // Float
-PARAM(Gen, XTAD, 'X', 'T', 'A', 'D') // Int
-PARAM(Gen, ZBUF, 'Z', 'B', 'U', 'F') // Bool
-// Parameters (ELSC)
-PARAM(Elec, AMPD, 'A', 'M', 'P', 'D') // Float
-PARAM(Elec, AMPL, 'A', 'M', 'P', 'L') // Bool
-PARAM(Elec, COLR, 'C', 'O', 'L', 'R') // Color
-PARAM(Elec, DFLG, 'D', 'F', 'L', 'G') // Bitfield
-PARAM(Elec, EPSM, 'E', 'P', 'S', 'M') // Asset (PART)
-PARAM(Elec, FEMT, 'F', 'E', 'M', 'T') // Emitter
-PARAM(Elec, GPSM, 'G', 'P', 'S', 'M') // Asset (PART)
-PARAM(Elec, GRAT, 'G', 'R', 'A', 'T') // Float
-PARAM(Elec, IEMT, 'I', 'E', 'M', 'T') // Emitter
-PARAM(Elec, LCL1, 'L', 'C', 'L', '1') // Color
-PARAM(Elec, LCL2, 'L', 'C', 'L', '2') // Color
-PARAM(Elec, LCL3, 'L', 'C', 'L', '3') // Color
-PARAM(Elec, LIFE, 'L', 'I', 'F', 'E') // Int
-PARAM(Elec, LWD1, 'L', 'W', 'D', '1') // Float
-PARAM(Elec, LWD2, 'L', 'W', 'D', '2') // Float
-PARAM(Elec, LWD3, 'L', 'W', 'D', '3') // Float
-PARAM(Elec, SCNT, 'S', 'C', 'N', 'T') // Int
-PARAM(Elec, SLIF, 'S', 'L', 'I', 'F') // Int
-PARAM(Elec, SSEG, 'S', 'S', 'E', 'G') // Int
-PARAM(Elec, SSWH, 'S', 'S', 'W', 'H') // Asset (SWHC)
-PARAM(Elec, TEXR, 'T', 'E', 'X', 'R') // UV
-PARAM(Elec, ZERY, 'Z', 'E', 'R', 'Y') // Bool
-// Parameters (SRSC)
-PARAM(Sorted, SPWN, 'S', 'P', 'W', 'N') // SpawnSystemKeyframeData
-// Parameters (SPSC)
-PARAM(Spawn, DEOL, 'D', 'E', 'O', 'L') // Bool
-PARAM(Spawn, FRCO, 'F', 'R', 'C', 'O') // Bool
-PARAM(Spawn, FROV, 'F', 'R', 'O', 'V') // Vector
-PARAM(Spawn, GIVL, 'G', 'I', 'V', 'L') // Int
-PARAM(Spawn, GORN, 'G', 'O', 'R', 'N') // Vector
-PARAM(Spawn, GTRN, 'G', 'T', 'R', 'N') // Vector
-PARAM(Spawn, IGGT, 'I', 'G', 'G', 'T') // Bool
-PARAM(Spawn, IGLT, 'I', 'G', 'L', 'T') // Bool
-PARAM(Spawn, IVEC, 'I', 'V', 'E', 'C') // Vector
-PARAM(Spawn, LSCL, 'L', 'S', 'C', 'L') // Vector
-PARAM(Spawn, ORNT, 'O', 'R', 'N', 'T') // Vector
-PARAM(Spawn, PCOL, 'P', 'C', 'O', 'L') // Color
-PARAM(Spawn, PSLT, 'P', 'S', 'L', 'T') // Int
-PARAM(Spawn, SCLE, 'S', 'C', 'L', 'E') // Vector
-PARAM(Spawn, SPWN, 'S', 'P', 'W', 'N') // SpawnSystemKeyframeData
-PARAM(Spawn, TRNL, 'T', 'R', 'N', 'L') // Vector
-PARAM(Spawn, VBLN, 'V', 'B', 'L', 'N') // Float
-PARAM(Spawn, VLM1, 'V', 'L', 'M', '1') // ModVector
-PARAM(Spawn, VLM2, 'V', 'L', 'M', '2') // ModVector
-PARAM(Spawn, VMD1, 'V', 'M', 'D', '1') // Bool
-PARAM(Spawn, VMD2, 'V', 'M', 'D', '2') // Bool
-// Parameters (SWHC)
-PARAM(Swoosh, AALP, 'A', 'A', 'L', 'P') // Bool
-PARAM(Swoosh, COLR, 'C', 'O', 'L', 'R') // Color
-PARAM(Swoosh, CLTX, 'C', 'L', 'T', 'X') // Bool
-PARAM(Swoosh, CRND, 'C', 'R', 'N', 'D') // Bool
-PARAM(Swoosh, CROS, 'C', 'R', 'O', 'S') // Bool
-PARAM(Swoosh, DFLG, 'D', 'F', 'L', 'G') // Bitfield
-PARAM(Swoosh, IROT, 'I', 'R', 'O', 'T') // Float
-PARAM(Swoosh, IVEL, 'I', 'V', 'E', 'L') // Vector
-PARAM(Swoosh, LENG, 'L', 'E', 'N', 'G') // Int
-PARAM(Swoosh, LLRD, 'L', 'L', 'R', 'D') // Bool
-PARAM(Swoosh, LRAD, 'L', 'R', 'A', 'D') // Float
-PARAM(Swoosh, NPOS, 'N', 'P', 'O', 'S') // Vector
-PARAM(Swoosh, ORNT, 'O', 'R', 'N', 'T') // Bool
-PARAM(Swoosh, POFS, 'P', 'O', 'F', 'S') // Vector
-PARAM(Swoosh, PSLT, 'P', 'S', 'L', 'T') // Int
-PARAM(Swoosh, ROTM, 'R', 'O', 'T', 'M') // Float
-PARAM(Swoosh, RRAD, 'R', 'R', 'A', 'D') // Float
-PARAM(Swoosh, SIDE, 'S', 'I', 'D', 'E') // Int
-PARAM(Swoosh, SPLN, 'S', 'P', 'L', 'N') // Float
-PARAM(Swoosh, SROT, 'S', 'R', 'O', 'T') // Bool
-PARAM(Swoosh, TEXR, 'T', 'E', 'X', 'R') // UV
-PARAM(Swoosh, TEXW, 'T', 'E', 'X', 'W') // Bool
-PARAM(Swoosh, TIME, 'T', 'I', 'M', 'E') // Float
-PARAM(Swoosh, TSPN, 'T', 'S', 'P', 'N') // Float
-PARAM(Swoosh, VELM, 'V', 'E', 'L', 'M') // Vector
-PARAM(Swoosh, VLM2, 'V', 'L', 'M', '2') // Vector
-PARAM(Swoosh, VLS1, 'V', 'L', 'S', '1') // Bool
-PARAM(Swoosh, VLS2, 'V', 'L', 'S', '2') // Bool
-PARAM(Swoosh, WIRE, 'W', 'I', 'R', 'E') // Bool
-PARAM(Swoosh, ZBUF, 'Z', 'B', 'U', 'F') // Bool
-// Parameters (DPSC)
-PARAM(Decal, 1ADD, '1', 'A', 'D', 'D') // Bool
-PARAM(Decal, 2ADD, '2', 'A', 'D', 'D') // Bool
-PARAM(Decal, 1TEX, '1', 'T', 'E', 'X') // Asset (TXTR)
-PARAM(Decal, 2TEX, '2', 'T', 'E', 'X') // Asset (TXTR)
-PARAM(Decal, 1CLR, '1', 'C', 'L', 'R') // Color
-PARAM(Decal, 2CLR, '2', 'C', 'L', 'R') // Color
-PARAM(Decal, 1OFF, '1', 'O', 'F', 'F') // Bool
-PARAM(Decal, 2OFF, '2', 'O', 'F', 'F') // Bool
-PARAM(Decal, 1ROT, '1', 'R', 'O', 'T') // Float
-PARAM(Decal, 2ROT, '2', 'R', 'O', 'T') // Float
-PARAM(Decal, 1SZE, '1', 'S', 'Z', 'E') // Float
-PARAM(Decal, 2SZE, '2', 'S', 'Z', 'E') // Float
-PARAM(Decal, 1LFT, '1', 'L', 'F', 'T') // Int
-PARAM(Decal, 2LFT, '2', 'L', 'F', 'T') // Int
-PARAM(Decal, DLFT, 'D', 'L', 'F', 'T') // Int
-PARAM(Decal, DMAB, 'D', 'M', 'A', 'B') // Bool
-PARAM(Decal, DMCL, 'D', 'M', 'C', 'L') // Color
-PARAM(Decal, DMDL, 'D', 'M', 'D', 'L') // Asset (CMDL)
-PARAM(Decal, DMOO, 'D', 'M', 'O', 'O') // Bool
-PARAM(Decal, DMOP, 'D', 'M', 'O', 'P') // Vector
-PARAM(Decal, DMRT, 'D', 'M', 'R', 'T') // Vector
-PARAM(Decal, DMSC, 'D', 'M', 'S', 'C') // Vector
-// Parameters (WPSC)
-PARAM(Weapon, APSM, 'A', 'P', 'S', 'M') // Asset (PART)
-PARAM(Weapon, APSO, 'A', 'P', 'S', 'O') // Bool
-PARAM(Weapon, APS1, 'A', 'P', 'S', '1') // Asset (PART)
-PARAM(Weapon, AP11, 'A', 'P', '1', '1') // Bool
-PARAM(Weapon, APS2, 'A', 'P', 'S', '2') // Asset (PART)
-PARAM(Weapon, AP21, 'A', 'P', '2', '1') // Bool
-PARAM(Weapon, ASW1, 'A', 'S', 'W', '1') // Asset (SWHC)
-PARAM(Weapon, AS11, 'A', 'S', '1', '1') // Bool
-PARAM(Weapon, ASW2, 'A', 'S', 'W', '2') // Asset (SWHC)
-PARAM(Weapon, AS12, 'A', 'S', '1', '2') // Bool
-PARAM(Weapon, ASW3, 'A', 'S', 'W', '3') // Asset (SWHC)
-PARAM(Weapon, AS13, 'A', 'S', '1', '3') // Bool
-PARAM(Weapon, B1CL, 'B', '1', 'C', 'L') // Color
-PARAM(Weapon, B1PO, 'B', '1', 'P', 'O') // Vector
-PARAM(Weapon, B1RT, 'B', '1', 'R', 'T') // Float
-PARAM(Weapon, B1SE, 'B', '1', 'S', 'E') // Float
-PARAM(Weapon, B1TX, 'B', '1', 'T', 'X') // UV
-PARAM(Weapon, B2CL, 'B', '2', 'C', 'L') // Color
-PARAM(Weapon, B2PO, 'B', '2', 'P', 'O') // Vector
-PARAM(Weapon, B2RT, 'B', '2', 'R', 'T') // Float
-PARAM(Weapon, B2SE, 'B', '2', 'S', 'E') // Float
-PARAM(Weapon, B2TX, 'B', '2', 'T', 'X') // UV
-PARAM(Weapon, BHBT, 'B', 'H', 'B', 'T') // Bool
-PARAM(Weapon, COLR, 'C', 'O', 'L', 'R') // Asset (CRSC)
-PARAM(Weapon, DP1C, 'D', 'P', '1', 'C') // Bool
-PARAM(Weapon, DP2C, 'D', 'P', '2', 'C') // Bool
-PARAM(Weapon, EELT, 'E', 'E', 'L', 'T') // Bool
-PARAM(Weapon, EWTR, 'E', 'W', 'T', 'R') // Bool
-PARAM(Weapon, F60H, 'F', '6', '0', 'H') // Bool
-PARAM(Weapon, FC60, 'F', 'C', '6', '0') // Bool
-PARAM(Weapon, FOFF, 'F', 'O', 'F', 'F') // Float
-PARAM(Weapon, HOMG, 'H', 'O', 'M', 'G') // Bool
-PARAM(Weapon, IORN, 'I', 'O', 'R', 'N') // Vector
-PARAM(Weapon, IVEC, 'I', 'V', 'E', 'C') // Vector
-PARAM(Weapon, LWTR, 'L', 'W', 'T', 'R') // Bool
-PARAM(Weapon, NDTT, 'N', 'D', 'T', 'T') // Bool
-PARAM(Weapon, OFST, 'O', 'F', 'S', 'T') // Vector
-PARAM(Weapon, OHEF, 'O', 'H', 'E', 'F') // Asset (CMDL)
-PARAM(Weapon, PCOL, 'P', 'C', 'O', 'L') // Color
-PARAM(Weapon, PJFX, 'P', 'J', 'F', 'X') // Int
-PARAM(Weapon, POFS, 'P', 'O', 'F', 'S') // Vector
-PARAM(Weapon, PSCL, 'P', 'S', 'C', 'L') // Vector
-PARAM(Weapon, PSLT, 'P', 'S', 'L', 'T') // Int
-PARAM(Weapon, PSOV, 'P', 'S', 'O', 'V') // Float
-PARAM(Weapon, PSVM, 'P', 'S', 'V', 'M') // Vector
-PARAM(Weapon, RB1A, 'R', 'B', '1', 'A') // Bool
-PARAM(Weapon, RB2A, 'R', 'B', '2', 'A') // Boo
-PARAM(Weapon, RNGE, 'R', 'N', 'G', 'E') // Float
-PARAM(Weapon, RTLA, 'R', 'T', 'L', 'A') // Bool
-PARAM(Weapon, RWPE, 'R', 'W', 'P', 'E') // Bool
-PARAM(Weapon, SPS1, 'S', 'P', 'S', '1') // Bool
-PARAM(Weapon, SPS2, 'S', 'P', 'S', '2') // Bool
-PARAM(Weapon, SVBD, 'S', 'V', 'B', 'D') // Bool
-PARAM(Weapon, SWTR, 'S', 'W', 'T', 'R') // Bool
-PARAM(Weapon, TECL, 'T', 'E', 'C', 'L') // Color
-PARAM(Weapon, TLEN, 'T', 'L', 'E', 'N') // Float
-PARAM(Weapon, TLPO, 'T', 'L', 'P', 'O') // Vector
-PARAM(Weapon, TRAT, 'T', 'R', 'A', 'T') // Float
-PARAM(Weapon, TSCL, 'T', 'S', 'C', 'L') // Color
-PARAM(Weapon, TSZE, 'T', 'S', 'Z', 'E') // Float
-PARAM(Weapon, TTEX, 'T', 'T', 'E', 'X') // UV
-PARAM(Weapon, VMD2, 'V', 'M', 'D', '2') // Bool
-// Parameters (CRSC)
-PARAM(Coli, 1ATA, '1', 'A', 'T', 'A') // Int
-PARAM(Coli, 2ATA, '2', 'A', 'T', 'A') // Int
-PARAM(Coli, 3ATA, '3', 'A', 'T', 'A') // Int
-PARAM(Coli, 4ATA, '4', 'A', 'T', 'A') // Int
-PARAM(Coli, 5ATA, '5', 'A', 'T', 'A') // Int
-PARAM(Coli, 6ATA, '6', 'A', 'T', 'A') // Int
-PARAM(Coli, 1ATB, '1', 'A', 'T', 'B') // Int
-PARAM(Coli, 2ATB, '2', 'A', 'T', 'B') // Int
-PARAM(Coli, 3ATB, '3', 'A', 'T', 'B') // Int
-PARAM(Coli, 4ATB, '4', 'A', 'T', 'B') // Int
-PARAM(Coli, 5ATB, '5', 'A', 'T', 'B') // Int
-PARAM(Coli, 6ATB, '6', 'A', 'T', 'B') // Int
-PARAM(Coli, 1BSE, '1', 'B', 'S', 'E') // Int
-PARAM(Coli, 2BSE, '2', 'B', 'S', 'E') // Int
-PARAM(Coli, 1DRN, '1', 'D', 'R', 'N') // Int
-PARAM(Coli, 2DRN, '2', 'D', 'R', 'N') // Int
-PARAM(Coli, 3DRN, '3', 'D', 'R', 'N') // Int
-PARAM(Coli, 4DRN, '4', 'D', 'R', 'N') // Int
-PARAM(Coli, 5DRN, '5', 'D', 'R', 'N') // Int
-PARAM(Coli, 6DRN, '6', 'D', 'R', 'N') // Int
-PARAM(Coli, 6GRN, '6', 'G', 'R', 'N') // Int
-PARAM(Coli, 1LAV, '1', 'L', 'A', 'V') // Asset (PART)
-PARAM(Coli, 3LAV, '3', 'L', 'A', 'V') // Asset (DPSC)
-PARAM(Coli, 1MUD, '1', 'M', 'U', 'D') // Asset (PART)
-PARAM(Coli, 2MUD, '2', 'M', 'U', 'D') // Int
-PARAM(Coli, 3MUD, '3', 'M', 'U', 'D') // Asset (DPSC)
-PARAM(Coli, 1SAN, '1', 'S', 'A', 'N') // Asset (PART)
-PARAM(Coli, 2SAN, '2', 'S', 'A', 'N') // Int
-PARAM(Coli, 3SAN, '3', 'S', 'A', 'N') // Asset (DPSC)
-PARAM(Coli, BHFX, 'B', 'H', 'F', 'X') // Int
-PARAM(Coli, CHDL, 'C', 'H', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, CHFX, 'C', 'H', 'F', 'X') // Int
-PARAM(Coli, CODL, 'C', 'O', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, CRTS, 'C', 'R', 'T', 'S') // Asset (PART)
-PARAM(Coli, CSFX, 'C', 'S', 'F', 'X') // Int
-PARAM(Coli, CZFX, 'C', 'Z', 'F', 'X') // Int
-PARAM(Coli, DCHR, 'D', 'C', 'H', 'R') // Asset (PART)
-PARAM(Coli, DCSH, 'D', 'C', 'S', 'H') // Int
-PARAM(Coli, DDCL, 'D', 'D', 'C', 'L') // Asset (DPSC)
-PARAM(Coli, DEFS, 'D', 'E', 'F', 'S') // Asset (PART)
-PARAM(Coli, DENM, 'D', 'E', 'N', 'M') // Asset (PART)
-PARAM(Coli, DESH, 'D', 'E', 'S', 'H') // Asset (PART)
-PARAM(Coli, DSFX, 'D', 'S', 'F', 'X') // Int
-PARAM(Coli, DSHX, 'D', 'S', 'H', 'X') // Int
-PARAM(Coli, ENDL, 'E', 'N', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, FOFF, 'F', 'O', 'F', 'F') // Float
-PARAM(Coli, GODL, 'G', 'O', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, GOFX, 'G', 'O', 'F', 'X') // Int
-PARAM(Coli, GOOO, 'G', 'O', 'O', 'O') // Asset (PART)
-PARAM(Coli, GRAS, 'G', 'R', 'A', 'S') // Asset (PART)
-PARAM(Coli, GRDL, 'G', 'R', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, GRFX, 'G', 'R', 'F', 'X') // Int
-PARAM(Coli, HBFX, 'H', 'B', 'F', 'X') // Int
-PARAM(Coli, ICDL, 'I', 'C', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, ICEE, 'I', 'C', 'E', 'E') // Int
-PARAM(Coli, ICFX, 'I', 'C', 'F', 'X') // Asset (PART)
-PARAM(Coli, MEDL, 'M', 'E', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, MSFX, 'M', 'S', 'F', 'X') // Int
-PARAM(Coli, MTLS, 'M', 'T', 'L', 'S') // Asset (PART)
-PARAM(Coli, PBOS, 'P', 'B', 'O', 'S') // Int
-PARAM(Coli, PBHX, 'P', 'B', 'H', 'X') // Int
-PARAM(Coli, PBSX, 'P', 'B', 'S', 'X') // Int
-PARAM(Coli, RNGE, 'R', 'N', 'G', 'E') // Float
-PARAM(Coli, SHFX, 'S', 'H', 'F', 'X') // Int
-PARAM(Coli, TAFX, 'T', 'A', 'F', 'X') // Int
-PARAM(Coli, TALP, 'T', 'A', 'L', 'P') // Asset (PART)
-PARAM(Coli, TASP, 'T', 'A', 'S', 'P') // Int
-PARAM(Coli, WATR, 'W', 'A', 'T', 'R') // Asset (PART)
-PARAM(Coli, WODL, 'W', 'O', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, WODS, 'W', 'O', 'D', 'S') // Asset (PART)
-PARAM(Coli, WSFX, 'W', 'S', 'F', 'X') // Int
-PARAM(Coli, WTDL, 'W', 'T', 'D', 'L') // Asset (DPSC)
-PARAM(Coli, WTFX, 'W', 'T', 'F', 'X') // Int
-PARAMS_END
-
-#undef PARAMS_BEGIN
-#undef PARAMS_END
-#undef PARAM
-
-// ************ PARTICLE FUNCTIONS ************
-#define FUNCS_BEGIN enum {
-#define FUNCS_END kParticleFunctionsMax };
-#define FUNC(Type, ParamName, CharA, CharB, CharC, CharD) k##Type##ParamName = FOURCC_CONSTEXPR(##CharA, ##CharB, ##CharC, ##CharD),
-
-FUNCS_BEGIN
-FUNC(Func, NONE, 'N', 'O', 'N', 'E')
-// Bool Functions
-FUNC(Bool, CNST, 'C','N','S','T') // Bool
-// Bitfield Functions
-FUNC(Bitfield, BITF, 'B', 'I', 'T', 'F') // Bitfield
-// Int Functions
-FUNC(Int, ADD_, 'A', 'D', 'D', '_') // Int, Int
-FUNC(Int, CHAN, 'C', 'H', 'A', 'N') // Int, Int, Int
-FUNC(Int, CLMP, 'C', 'L', 'M', 'P') // Int, Int, Int
-FUNC(Int, CNST, 'C', 'N', 'S', 'T') // Int
-FUNC(Int, DETH, 'D', 'E', 'T', 'H') // Int, Int
-FUNC(Int, DIVD, 'D', 'I', 'V', 'D') // Int, Int
-FUNC(Int, GAPC, 'G', 'A', 'P', 'C') // N/A
-FUNC(Int, GEMT, 'G', 'E', 'M', 'T') // N/A
-FUNC(Int, GTCP, 'G', 'T', 'C', 'P') // N/A
-FUNC(Int, ILPT, 'I', 'L', 'P', 'T') // Int
-FUNC(Int, IMPL, 'I', 'M', 'P', 'L') // Int
-FUNC(Int, IRND, 'I', 'R', 'N', 'D') // Int, Int
-FUNC(Int, ISWT, 'I', 'S', 'W', 'T') // Int, Int
-FUNC(Int, KEYE, 'K', 'E', 'Y', 'E') // KeyframeEmitterData
-FUNC(Int, KEYF, 'K', 'E', 'Y', 'F') // KeyframeEmitterData
-FUNC(Int, KEYP, 'K', 'E', 'Y', 'P') // KeyframeEmitterData
-FUNC(Int, KPIN, 'K', 'P', 'I', 'N') // Int
-FUNC(Int, MODU, 'M', 'O', 'D', 'U') // Int, Int
-FUNC(Int, MULT, 'M', 'U', 'L', 'T') // Int, Int
-FUNC(Int, PCRT, 'P', 'C', 'R', 'T') // N/A
-FUNC(Int, PDET, 'P', 'D', 'E', 'T') // N/A
-FUNC(Int, PULS, 'P', 'U', 'L', 'S') // Int, Int, Int, Int
-FUNC(Int, RAND, 'R', 'A', 'N', 'D') // Int, Int
-FUNC(Int, RTOI, 'R', 'T', 'O', 'I') // Float, Float
-FUNC(Int, SPAH, 'S', 'P', 'A', 'H') // Int, Int, Int
-FUNC(Int, SUB_, 'S', 'U', 'B', '_') // Int, Int
-FUNC(Int, TSCL, 'T', 'S', 'C', 'L') // Float
-// Float Functions
-FUNC(Float, ADD_, 'A', 'D', 'D', '_') // Float, Float
-FUNC(Float, CEQL, 'C', 'E', 'Q', 'L') // Float, Float, Float, Float
-FUNC(Float, CEXT, 'C', 'E', 'X', 'T') // Int
-FUNC(Float, CHAN, 'C', 'H', 'A', 'N') // Float, Float, Int
-FUNC(Float, CLMP, 'C', 'L', 'M', 'P') // Float, Float, Float
-FUNC(Float, CLTN, 'C', 'L', 'T', 'N') // Float, Float, Float, Float
-FUNC(Float, CNST, 'C', 'N', 'S', 'T') // Float
-FUNC(Float, CRNG, 'C', 'R', 'N', 'G') // Float, Float, Float, Float, Float
-FUNC(Float, DOTP, 'D', 'O', 'T', 'P') // Vector, Vector
-FUNC(Float, GTCR, 'G', 'T', 'C', 'R') // Color
-FUNC(Float, GTCG, 'G', 'T', 'C', 'G') // Color
-FUNC(Float, GTCB, 'G', 'T', 'C', 'B') // Color
-FUNC(Float, GTCA, 'G', 'T', 'C', 'A') // Color
-FUNC(Float, GTCP, 'G', 'T', 'C', 'P') // N/A
-FUNC(Float, IRND, 'I', 'R', 'N', 'D') // Float, Float
-FUNC(Float, ISWT, 'I', 'S', 'W', 'T') // Float, Float
-FUNC(Float, ITRL, 'I', 'T', 'R', 'L') // Int, Float
-FUNC(Float, KEYE, 'K', 'E', 'Y', 'E') // KeyframeEmitterData
-FUNC(Float, KEYF, 'K', 'E', 'Y', 'F') // KeyframeEmitterData
-FUNC(Float, KEYP, 'K', 'E', 'Y', 'P') // KeyframeEmitterData
-FUNC(Float, KPIN, 'K', 'P', 'I', 'N') // Float
-FUNC(Float, LFTW, 'L', 'F', 'T', 'W') // Float, Float
-FUNC(Float, MULT, 'M', 'U', 'L', 'T') // Float, Float
-FUNC(Float, OCSP, 'O', 'C', 'S', 'P') // Int
-FUNC(Float, PAP1, 'P', 'A', 'P', '1') // N/A
-FUNC(Float, PAP2, 'P', 'A', 'P', '2') // N/A
-FUNC(Float, PAP3, 'P', 'A', 'P', '3') // N/A
-FUNC(Float, PAP4, 'P', 'A', 'P', '4') // N/A
-FUNC(Float, PAP5, 'P', 'A', 'P', '5') // N/A
-FUNC(Float, PAP6, 'P', 'A', 'P', '6') // N/A
-FUNC(Float, PAP7, 'P', 'A', 'P', '7') // N/A
-FUNC(Float, PAP8, 'P', 'A', 'P', '8') // N/A
-FUNC(Float, PAP9, 'P', 'A', 'P', '9') // N/A
-FUNC(Float, PNO1, 'P', 'N', 'O', '1') // Float, Float, Float, Int
-FUNC(Float, PNO2, 'P', 'N', 'O', '2') // Float, Float, Float, Float, Int
-FUNC(Float, PNO3, 'P', 'N', 'O', '3') // Vector, Float, Float, Int
-FUNC(Float, PNO4, 'P', 'N', 'O', '4') // Vector, Float, Float, Float, Int
-FUNC(Float, PRN1, 'P', 'R', 'N', '1') // Float
-FUNC(Float, PRN2, 'P', 'R', 'N', '2') // Float, Float
-FUNC(Float, PRN3, 'P', 'R', 'N', '3') // Vector
-FUNC(Float, PRN4, 'P', 'R', 'N', '4') // Vector, Float
-FUNC(Float, PRLW, 'P', 'R', 'L', 'W') // N/A
-FUNC(Float, PSLL, 'P', 'S', 'L', 'L') // N/A
-FUNC(Float, PULS, 'P', 'U', 'L', 'S') // Int, Int, Float, Float
-FUNC(Float, RAND, 'R', 'A', 'N', 'D') // Float, Float
-FUNC(Float, RLPT, 'R', 'L', 'P', 'T') // Float
-FUNC(Float, SCAL, 'S', 'C', 'A', 'L') // Float
-FUNC(Float, SINE, 'S', 'I', 'N', 'E') // Float, Float, Float
-FUNC(Float, SUB_, 'S', 'U', 'B', '_') // Float, Float
-FUNC(Float, TOCS, 'T', 'O', 'C', 'S') // Bool, Int, Int, Int
-FUNC(Float, VMAG, 'V', 'M', 'A', 'G') // Vector
-FUNC(Float, VXTR, 'V', 'X', 'T', 'R') // Vector
-FUNC(Float, VYTR, 'V', 'Y', 'T', 'R') // Vector
-FUNC(Float, VZTR, 'V', 'Z', 'T', 'R') // Vector
-// Vector Functions
-FUNC(Vector, ADD_, 'A', 'D', 'D', '_') // Vector, Vector
-FUNC(Vector, ANGC, 'A', 'N', 'G', 'C') // Float, Float, Float, Float, Float
-FUNC(Vector, CCLU, 'C', 'C', 'L', 'U') // Vector, Vector, Int, Float
-FUNC(Vector, CHAN, 'C', 'H', 'A', 'N') // Vector, Vector, Int
-FUNC(Vector, CIRC, 'C', 'I', 'R', 'C') // Vector, Vector, Float, Float, Float
-FUNC(Vector, CNST, 'C', 'N', 'S', 'T') // Float, Float, Float
-FUNC(Vector, CONE, 'C', 'O', 'N', 'E') // Vector, Float
-FUNC(Vector, CTVC, 'C', 'T', 'V', 'C') // Color
-FUNC(Vector, ISWT, 'I', 'S', 'W', 'T') // Vector, Vector
-FUNC(Vector, KEYE, 'K', 'E', 'Y', 'E') // KeyframeEmitterData
-FUNC(Vector, KEYF, 'K', 'E', 'Y', 'F') // KeyframeEmitterData
-FUNC(Vector, KEYP, 'K', 'E', 'Y', 'P') // KeyframeEmitterData
-FUNC(Vector, KPIN, 'K', 'P', 'I', 'N') // Vector
-FUNC(Vector, MULT, 'M', 'U', 'L', 'T') // Vector, Vector
-FUNC(Vector, NORM, 'N', 'O', 'R', 'M') // Vector
-FUNC(Vector, PAP1, 'P', 'A', 'P', '1') // N/A
-FUNC(Vector, PAP2, 'P', 'A', 'P', '2') // N/A
-FUNC(Vector, PAP3, 'P', 'A', 'P', '3') // N/A
-FUNC(Vector, PENV, 'P', 'E', 'N', 'V') // N/A
-FUNC(Vector, PETR, 'P', 'E', 'T', 'R') // N/A
-FUNC(Vector, PEVL, 'P', 'E', 'V', 'L') // N/A
-FUNC(Vector, PINV, 'P', 'I', 'N', 'V') // N/A
-FUNC(Vector, PITR, 'P', 'I', 'T', 'R') // N/A
-FUNC(Vector, PIVL, 'P', 'I', 'V', 'L') // N/A
-FUNC(Vector, PNCV, 'P', 'N', 'C', 'V') // N/A
-FUNC(Vector, PLCO, 'P', 'L', 'C', 'O') // N/A
-FUNC(Vector, PLOC, 'P', 'L', 'O', 'C') // N/A
-FUNC(Vector, PSOF, 'P', 'S', 'O', 'F') // N/A
-FUNC(Vector, PSOU, 'P', 'S', 'O', 'U') // N/A
-FUNC(Vector, PSOR, 'P', 'S', 'O', 'R') // N/A
-FUNC(Vector, PSTR, 'P', 'S', 'T', 'R') // N/A
-FUNC(Vector, PULS, 'P', 'U', 'L', 'S') // Int, Int, Vector, Vector
-FUNC(Vector, PVEL, 'P', 'V', 'E', 'L') // N/A
-FUNC(Vector, RNDV, 'R', 'N', 'D', 'V') // Float
-FUNC(Vector, RTOV, 'R', 'T', 'O', 'V') // Float
-FUNC(Vector, SUB_, 'S', 'U', 'B', '_') // Vector, Vector
-// Mod Vector Functions
-FUNC(ModVector, BNCE, 'B', 'N', 'C', 'E') // Vector, Vector, Float, Float, Bool
-FUNC(ModVector, BOXV, 'B', 'O', 'X', 'V') // Vector, Vector, ModVector
-FUNC(ModVector, CHAN, 'C', 'H', 'A', 'N') // ModVector, ModVector, Int
-FUNC(ModVector, CNST, 'C', 'N', 'S', 'T') // Float, Float, Float
-FUNC(ModVector, EMPL, 'E', 'M', 'P', 'L') // Vector, Float, Float, Float, Bool
-FUNC(ModVector, EXPL, 'E', 'X', 'P', 'L') // Float, Float
-FUNC(ModVector, GRAV, 'G', 'R', 'A', 'V') // Vector
-FUNC(ModVector, IMPL, 'I', 'M', 'P', 'L') // Vector, Float, Float, Float, Bool
-FUNC(ModVector, LMPL, 'L', 'M', 'P', 'L') // Vector, Float, Float, Float, Bool
-FUNC(ModVector, PULS, 'P', 'U', 'L', 'S') // Int, Int, ModVector, ModVector
-FUNC(ModVector, SPHV, 'S', 'P', 'H', 'V') // Vector, Float, ModVector
-FUNC(ModVector, SPOS, 'S', 'P', 'O', 'S') // Vector
-FUNC(ModVector, SWRL, 'S', 'W', 'R', 'L') // Vector, Vector, Float, Float
-FUNC(ModVector, WIND, 'W', 'I', 'N', 'D') // Vector, Float
-// Color Functions
-FUNC(Color, CFDE, 'C', 'F', 'D', 'E') // Color, Color, Float, Float
-FUNC(Color, CHAN, 'C', 'H', 'A', 'N') // Color, Color, Int
-FUNC(Color, CNST, 'C', 'N', 'S', 'T') // Float, Float, Float, Float
-FUNC(Color, FADE, 'F', 'A', 'D', 'E') // Color, Color, Float
-FUNC(Color, ISWT, 'I', 'S', 'W', 'T') // Color, Color
-FUNC(Color, KEYE, 'K', 'E', 'Y', 'E') // KeyframeEmitterData
-FUNC(Color, KEYF, 'K', 'E', 'Y', 'F') // KeyframeEmitterData
-FUNC(Color, KEYP, 'K', 'E', 'Y', 'P') // KeyframeEmitterData
-FUNC(Color, KPIN, 'K', 'P', 'I', 'N') // Color
-FUNC(Color, MDAO, 'M', 'D', 'A', 'O') // Color, Float
-FUNC(Color, MULT, 'M', 'U', 'L', 'T') // Color, Color
-FUNC(Color, PCOL, 'P', 'C', 'O', 'L') // N/A
-FUNC(Color, PULS, 'P', 'U', 'L', 'S') // Int, Int, Color, Color
-FUNC(Color, VRTC, 'V', 'R', 'T', 'C') // Vector, Float
-// UV Functions
-FUNC(UV, CNST, 'C', 'N', 'S', 'T') // Asset (TXTR)
-FUNC(UV, ATEX, 'A', 'T', 'E', 'X') // Asset (TXTR), Int, Int, Int, Int, Int, Bool
-// Sound Functions
-FUNC(Sound, CNST, 'C', 'N', 'S', 'T') // Sound ID
-// Asset Functions
-FUNC(Asset, CNST, 'C', 'N', 'S', 'T') // Asset ID
-// Emitter Functions
-FUNC(Emitter, ASPH, 'A', 'S', 'P', 'H') // Vector, Float, Float, Float, Float, Float, Float
-FUNC(Emitter, ELPS, 'E', 'L', 'P', 'S') // Vector, Vector, Vector, Float, Bool
-FUNC(Emitter, PLNE, 'P', 'L', 'N', 'E') // Vector, Vector, Vector, Float, Float, Float
-FUNC(Emitter, SEMR, 'S', 'E', 'M', 'R') // Vector, Vector
-FUNC(Emitter, SETR, 'S', 'E', 'T', 'R') // Vector, Vector
-FUNC(Emitter, SPHE, 'S', 'P', 'H', 'E') // Vector, Float, Float
-FUNCS_END
-
-#undef FUNCS_BEGIN
-#undef FUNCS_END
-#undef FUNC
-
-#endif // PARTICLEPARAMETERS
-

src/Editor/CEditorApplication.cpp

@@ -200,7 +200,12 @@ void CEditorApplication::OnEditorClose()
     IEditor *pEditor = qobject_cast<IEditor*>(sender());
     ASSERT(pEditor);
 
-    if (pEditor != mpWorldEditor)
+    if (pEditor == mpWorldEditor)
+    {
+        mpWorldEditor = nullptr;
+        quit();
+    }
+    else
     {
         for (auto Iter = mEditingMap.begin(); Iter != mEditingMap.end(); Iter++)
         {

src/Editor/CExportGameDialog.cpp

@@ -140,7 +140,7 @@ bool CExportGameDialog::ValidateGame()
 
     switch (GameID.ToLong())
     {
-    case IFOURCC('GM8X'):
+    case FOURCC('GM8X'):
         // This ID is normally MP1, but it's used by the MP1 NTSC demo and the MP2 bonus disc demo as well
         if (strcmp(rkHeader.m_gameTitle, "Long Game Name") == 0)
         {
@@ -151,7 +151,7 @@ bool CExportGameDialog::ValidateGame()
         mGame = ePrime;
         break;
 
-    case IFOURCC('G2MX'):
+    case FOURCC('G2MX'):
         // Echoes, but also appears in the MP3 proto
         if (mGameID[4] == 'A' && mGameID[5] == 'B')
             mGame = eCorruptionProto;
@@ -159,23 +159,23 @@ bool CExportGameDialog::ValidateGame()
             mGame = eEchoes;
         break;
 
-    case IFOURCC('RM3X'):
+    case FOURCC('RM3X'):
         mGame = eCorruption;
         break;
 
-    case IFOURCC('SF8X'):
+    case FOURCC('SF8X'):
         mGame = eReturns;
         break;
 
-    case IFOURCC('R3MX'):
+    case FOURCC('R3MX'):
         // Trilogy
         mTrilogy = true;
         if (!RequestTrilogyGame()) return false;
         break;
 
-    case IFOURCC('R3IX'):
+    case FOURCC('R3IX'):
         // MP1 Wii de Asobu
-    case IFOURCC('R32X'):
+    case FOURCC('R32X'):
         // MP2 Wii de Asobu
     default:
         // Unrecognized game ID