Merge pull request H-uru#78 from diafero/rel-include

These cleanups are always great.
Hoikas · Sep 1, 2011 · 34d27c5 · 34d27c5
2 parents 1b8f31c + adc3653
commit 34d27c5
Show file tree

Hide file tree

Showing 53 changed files with 111 additions and 6,936 deletions.
diff --git a/Sources/Plasma/CoreLib/hsThread_Unix.cpp b/Sources/Plasma/CoreLib/hsThread_Unix.cpp
@@ -153,7 +153,7 @@ static void InitMutexTimerFile()
 #include <time.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "../NucleusLib/inc/hsTimer.h"
+#include "NucleusLib/inc/hsTimer.h"
 
 
 static FILE * gEventLoggingFile = nil;

diff --git a/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h b/Sources/Plasma/NucleusLib/inc/pnNucleusCreatables.h
@@ -45,12 +45,12 @@ REGISTER_NONCREATABLE( plPhysical );
 #include "plgDispatch.h"
 REGISTER_NONCREATABLE( plDispatchBase );
 
-#include "../pnDispatch/pnDispatchCreatable.h"
-#include "../pnKeyedObject/pnKeyedObjectCreatable.h"
-#include "../pnMessage/pnMessageCreatable.h"
-#include "../pnModifier/pnModifierCreatable.h"
-#include "../pnNetCommon/pnNetCommonCreatable.h"
-#include "../pnSceneObject/pnSceneObjectCreatable.h"
-#include "../pnTimer/pnTimerCreatable.h"
+#include "pnDispatch/pnDispatchCreatable.h"
+#include "pnKeyedObject/pnKeyedObjectCreatable.h"
+#include "pnMessage/pnMessageCreatable.h"
+#include "pnModifier/pnModifierCreatable.h"
+#include "pnNetCommon/pnNetCommonCreatable.h"
+#include "pnSceneObject/pnSceneObjectCreatable.h"
+#include "pnTimer/pnTimerCreatable.h"
 
 #endif // pnNucleusCreatables_inc
diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp b/Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
@@ -34,6 +34,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plUoid.h"
 #include <string.h>
 
+#include "plFixedKey.h"
+#include "plCreatableIndex.h"
+#include "pnKeyedObject/plKey.h"
+#include "pnFactory/plCreator.h"
+
 //// plKeySeed ///////////////////////////////////////////////////////////////
 //  Our seed struct. Defined here so it doesn't have to be in the .h file
 
@@ -55,11 +60,6 @@ struct plKeySeed
     }
 };
 
-#include "plFixedKey.h"
-#include "plCreatableIndex.h"
-#include "../pnKeyedObject/plKey.h"
-#include "../pnFactory/plCreator.h"
-
 // Rules for SeedList:
     // 1) Must be in the Same order as enum fixedKey
     // 2) For now at least, all your fixed keys get put into the kGlobalFixedLoc room, reserved just for fixed keys

diff --git a/Sources/Plasma/NucleusLib/pnMessage/plEnvEffectMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plEnvEffectMsg.cpp