diff --git a/Sources/Tools/MaxComponent/plParticleComponents.cpp b/Sources/Tools/MaxComponent/plParticleComponents.cpp index 0ebc60cc..a60f25e0 100644 --- a/Sources/Tools/MaxComponent/plParticleComponents.cpp +++ b/Sources/Tools/MaxComponent/plParticleComponents.cpp @@ -669,7 +669,7 @@ ParamBlockDesc2 gParticleBk IDC_COMP_PARTICLE_LIFEMAX, IDC_COMP_PARTICLE_LIFEMAX_SPIN, 1.0, end, - plParticleCoreComponent::kImmortal, _T("Immortal"), TYPE_BOOL, + plParticleCoreComponent::kImmortal, _T("Immortal"), TYPE_BOOL, 0, 0, p_default, FALSE, p_ui, TYPE_SINGLECHEKBOX, IDC_COMP_PARTICLE_NODIE, end, @@ -737,7 +737,7 @@ ParamBlockDesc2 gParticleBk IDC_COMP_PARTICLE_ROT_RANGE, IDC_COMP_PARTICLE_ROT_RANGE_SPIN, 1.0, end, - plParticleCoreComponent::kFollowSystem, _T("FollowSystem"), TYPE_BOOL, + plParticleCoreComponent::kFollowSystem, _T("FollowSystem"), TYPE_BOOL, 0, 0, p_default, FALSE, p_ui, TYPE_SINGLECHEKBOX, IDC_COMP_PARTICLE_FOLLOW_SYSTEM, end, @@ -1255,12 +1255,12 @@ ParamBlockDesc2 gParticleWindBk IDC_COMP_PARTICLE_WIND_SWIRL, IDC_COMP_PARTICLE_WIND_SWIRL_SPIN, 1.0, end, - plParticleWindComponent::kHorizontal, _T("Horizontal"), TYPE_BOOL, + plParticleWindComponent::kHorizontal, _T("Horizontal"), TYPE_BOOL, 0, 0, p_default, FALSE, p_ui, TYPE_SINGLECHEKBOX, IDC_COMP_PARTICLE_WIND_HORIZONTAL, end, - plParticleWindComponent::kLocalize, _T("Localize"), TYPE_BOOL, + plParticleWindComponent::kLocalize, _T("Localize"), TYPE_BOOL, 0, 0, p_default, TRUE, end, @@ -1348,7 +1348,7 @@ ParamBlockDesc2 gParticleUniWindBk IDC_COMP_PARTICLE_WIND_SWIRL, IDC_COMP_PARTICLE_WIND_SWIRL_SPIN, 1.0, end, - plParticleUniWindComponent::kHorizontal, _T("Horizontal"), TYPE_BOOL, + plParticleUniWindComponent::kHorizontal, _T("Horizontal"), TYPE_BOOL, 0, 0, p_default, FALSE, p_ui, TYPE_SINGLECHEKBOX, IDC_COMP_PARTICLE_WIND_HORIZONTAL, end, diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt index e03acae7..13eb4014 100644 --- a/Sources/Tools/MaxMain/CMakeLists.txt +++ b/Sources/Tools/MaxMain/CMakeLists.txt @@ -14,6 +14,7 @@ include_directories(${PYTHON_INCLUDE_DIR}) set(MaxMain_HEADERS GlobalUtility.h + main.def MaxAllocDll.h plActionTableMgr.h plAgeDescInterface.h diff --git a/Sources/Tools/MaxMain/GlobalUtility.cpp b/Sources/Tools/MaxMain/GlobalUtility.cpp index 1b64a238..321d7674 100644 --- a/Sources/Tools/MaxMain/GlobalUtility.cpp +++ b/Sources/Tools/MaxMain/GlobalUtility.cpp @@ -99,8 +99,8 @@ void DoAllRecur(PMaxNodeFunc p, plMaxNode *node) //#include "../MaxComponent/plComponentBase.h" -#include "../MaxExport/plExportErrorMsg.h" -#include "../MaxExport/plExportDlg.h" +#include "MaxExport/plExportErrorMsg.h" +#include "MaxExport/plExportDlg.h" static void NotifyProc(void *param, NotifyInfo *info) { @@ -199,9 +199,18 @@ DWORD PlasmaMax::Start() #endif // Setup the localization mgr - std::string clientPath = plMaxConfig::GetClientPath(false, true); - clientPath += "dat"; - pfLocalizationMgr::Initialize(clientPath); + // Dirty hacks are because Cyan sucks... + const char* pathTemp = plMaxConfig::GetClientPath(false, true); + if (pathTemp == nil) + { + hsMessageBox("PlasmaMAX2.ini is missing the Client Path", "Error", hsMessageBoxNormal); + } + else + { + std::string clientPath(pathTemp); + clientPath += "dat"; + pfLocalizationMgr::Initialize(clientPath); + } return GUPRESULT_KEEP; } diff --git a/Sources/Tools/MaxMain/main.cpp b/Sources/Tools/MaxMain/main.cpp index 18f1acdd..9329c531 100644 --- a/Sources/Tools/MaxMain/main.cpp +++ b/Sources/Tools/MaxMain/main.cpp @@ -92,9 +92,11 @@ __declspec(dllexport) ClassDesc *LibClassDesc(int i) return GetComponentUtilDesc(); case 4: return GetComponentMgrDesc(); -#ifdef MAXSCENEVIEWER_ENABLED case 5: +#ifdef MAXSCENEVIEWER_ENABLED return GetMaxFileDataDesc(); +#else + return 0; #endif case 6: return GetMaxUtilsDesc(); diff --git a/Sources/Tools/MaxMain/plPluginResManager.h b/Sources/Tools/MaxMain/plPluginResManager.h index 1a0197bd..b44919d7 100644 --- a/Sources/Tools/MaxMain/plPluginResManager.h +++ b/Sources/Tools/MaxMain/plPluginResManager.h @@ -26,8 +26,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plPluginResManager_h_inc #define plPluginResManager_h_inc -#include "../plResMgr/plResManager.h" -#include "../pnKeyedObject/plKey.h" +#include "plResMgr/plResManager.h" +#include "pnKeyedObject/plKey.h" #include "hsTemplates.h" class plPageInfo; diff --git a/Sources/Tools/MaxPlasmaLights/CMakeLists.txt b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt index 63d3e10b..f3aa7e32 100644 --- a/Sources/Tools/MaxPlasmaLights/CMakeLists.txt +++ b/Sources/Tools/MaxPlasmaLights/CMakeLists.txt @@ -13,6 +13,7 @@ set(MaxPlasmaLights_HEADERS plRTLightBaseAnimDlgProc.h plRTLightBaseAnimPBDec.h plRTObjLightDesc.h + plRTPlasmaLights.def plRTProjDirLight.h plRTProjDirLightClassDesc.h plRTProjDirLightPBDec.h