Removed STLport requirement

engine/server/library/serverScript/src/shared/GameScriptObject.cpp

@@ -28,6 +28,7 @@
 #include "serverGame/ServerObject.h"
 
 #include <algorithm>
+#include <climits>
 
 
 #ifdef _WIN32

engine/server/library/serverScript/src/shared/ScriptFunctionTable.h

@@ -9,7 +9,7 @@
 #ifndef _INCLUDED_ScriptFuncTable_H
 #define _INCLUDED_ScriptFuncTable_H
 
-#include <hash_map>
+#include <tr1/unordered_map>
 
 namespace Scripting
 {
@@ -495,7 +495,7 @@ struct ScriptFuncTable
 	const char *argList;
 };
 
-typedef std::hash_map< int, const ScriptFuncTable * > _ScriptFuncHashMap;
+typedef std::tr1::unordered_map< int, const ScriptFuncTable * > _ScriptFuncHashMap;
 extern _ScriptFuncHashMap *ScriptFuncHashMap;
 extern void InitScriptFuncHashMap(void);
 extern void RemoveScriptFuncHashMap(void);

engine/server/library/serverScript/src/shared/ScriptMethodsAttributes.cpp

@@ -19,6 +19,8 @@
 #include "sharedGame/GameObjectTypes.h"
 #include "swgSharedUtility/CombatEngineData.h"
 
+#include <climits>
+
 using namespace JNIWrappersNamespace;
 
 

engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp

@@ -2310,7 +2310,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::isFacing(JNIEnv *env, jobject
 	Vector positionInObjectSpace = object->rotateTranslate_w2o (v);
 	real theta = positionInObjectSpace.theta ();
 
-	if (abs(theta) <= PI_OVER_4)
+	if (std::abs(theta) <= PI_OVER_4)
 		return JNI_TRUE;
 	else
 		return JNI_FALSE;
@@ -2559,7 +2559,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::areFacingEachOther(JNIEnv *en
 	Vector positionInObjectSpace = object1->rotateTranslate_w2o (object2->getPosition_w());
 	real theta = positionInObjectSpace.theta ();
 
-	if (abs(theta) > PI_OVER_4)
+	if (std::abs(theta) > PI_OVER_4)
 		return JNI_FALSE;
 	else
 	{
@@ -2567,7 +2567,7 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::areFacingEachOther(JNIEnv *en
 		Vector positionInObjectSpace2 = object2->rotateTranslate_w2o (object1->getPosition_w());
 		real theta2 = positionInObjectSpace2.theta ();
 
-		if (abs(theta2) > PI_OVER_4)
+		if (std::abs(theta2) > PI_OVER_4)
 			return JNI_FALSE;
 		else
 			return JNI_TRUE;

engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp

@@ -38,7 +38,7 @@
 #include "serverUtility/FreeCtsDataTable.h"
 #include "UnicodeUtils.h"
 
-#include <hash_set>
+#include <tr1/unordered_set>
 
 using namespace JNIWrappersNamespace;
 
@@ -434,7 +434,7 @@ jboolean JNICALL ScriptMethodsPlayerAccountNamespace::isAccountQualifiedForHouse
 	UNREF(self);
 	NOT_NULL(env);
 
-	static std::hash_set<StationId> accountsQualifiedForHousePackup;
+	static std::tr1::unordered_set<StationId> accountsQualifiedForHousePackup;
 	if (accountsQualifiedForHousePackup.empty())
 	{
 		DataTable * table = DataTableManager::getTable(ConfigServerGame::getHousePackupAccountListDataTableName(), true);

engine/server/library/serverScript/src/shared/ScriptMethodsSkill.cpp

@@ -23,6 +23,9 @@
 #include "sharedSkillSystem/SkillObject.h"
 
 #include "UnicodeUtils.h"
+
+#include <climits>
+
 using namespace JNIWrappersNamespace;