OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Fix some 3dsm crashes

Browse Source
This commit is contained in:
Adam Johnson
2011-04-16 00:49:03 -04:00
parent 745d8c675f
commit 45c6a4bd6b
6 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/Tools/MaxComponent/plParticleComponents.cpp
View File

@ -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,

1
Sources/Tools/MaxMain/CMakeLists.txt
View File

@ -14,6 +14,7 @@ include_directories(${PYTHON_INCLUDE_DIR})
set(MaxMain_HEADERS
GlobalUtility.h
main.def
MaxAllocDll.h
plActionTableMgr.h
plAgeDescInterface.h

19
Sources/Tools/MaxMain/GlobalUtility.cpp
View File

@ -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;
}

4
Sources/Tools/MaxMain/main.cpp
View File

@ -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();

4
Sources/Tools/MaxMain/plPluginResManager.h
View File

@ -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;

1
Sources/Tools/MaxPlasmaLights/CMakeLists.txt
View File

@ -13,6 +13,7 @@ set(MaxPlasmaLights_HEADERS
plRTLightBaseAnimDlgProc.h
plRTLightBaseAnimPBDec.h
plRTObjLightDesc.h
plRTPlasmaLights.def
plRTProjDirLight.h
plRTProjDirLightClassDesc.h
plRTProjDirLightPBDec.h