OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Merge pull request #273 from 'paradox/clang'

Browse Source 
Conflicts:
	Sources/Tools/MaxConvert/Pch.h
	Sources/Tools/MaxConvert/hsControlConverter.cpp
This commit is contained in:
Adam Johnson
2013-01-31 19:14:57 -05:00
parent a8b2509736 e98a95fc94
commit f5abe4ab15
103 changed files with 211 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.cpp
View File

@ -56,7 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//#include "../plPipeline/plDebugGeometry.h"
#include <math.h>
#include <cmath>
#include <algorithm>
#include "pfObjectFlocker.h"

1
Sources/Plasma/FeatureLib/pfAnimation/pfObjectFlocker.h
View File

@ -43,6 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define OBJECT_FLOCKER_H
#include "pnModifier/plSingleModifier.h"
#include <algorithm>
class hsStream;
class hsResMgr;

1
Sources/Plasma/FeatureLib/pfAnimation/plRandomCommandMod.cpp
View File

@ -40,7 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include <stdlib.h>
#include <cmath>
#include "HeadSpin.h"

4
Sources/Plasma/FeatureLib/pfAnimation/plStereizer.cpp
View File

@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
#include <math.h>
#include <cmath>
#include "HeadSpin.h"
@ -307,4 +307,4 @@ bool plStereizer::CheckForMaster()
}
}
return false;
}
}

1
Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGameGUIMgr.cpp
View File

@ -49,7 +49,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// //
//////////////////////////////////////////////////////////////////////////////
#include <stdlib.h>
#include "hsTimer.h"
#include "HeadSpin.h"
#include "pfGameGUIMgr.h"

3
Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.h
View File

@ -63,9 +63,6 @@ struct LocElementInfo;
struct LocSetInfo;
struct LocAgeInfo;
// Temporary helper (until everything is plString-ized)
typedef std::vector<std::wstring> WStringVector;
class pfLocalizationDataMgr
{
private:

2
Sources/Plasma/FeatureLib/pfPython/Pch.h
View File

@ -55,7 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <string>
// Platform Library Includes
#include <time.h>
#include <ctime>
#include <sys/types.h>
#include <sys/stat.h>

2
Sources/Plasma/FeatureLib/pfPython/plPythonPack.cpp
View File

@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <Python.h>
#include <marshal.h>
#include <time.h>
#include <ctime>
#include <string>
#include "HeadSpin.h"