fixing

spidamoo · Oct 14, 2013 · e615142 · e615142
1 parent 4cea6cf
commit e615142
Show file tree

Hide file tree

Showing 8 changed files with 426 additions and 11 deletions.
diff --git a/SoDlib/SoDLib.depend b/SoDlib/SoDLib.depend
diff --git a/SoDlib/include/Effect.h b/SoDlib/include/Effect.h
@@ -16,5 +16,5 @@ class Effect
 		float time;
 	private:
 };
-
+#define EFFECT_H_COMPLETE
 #endif // EFFECT_H
diff --git a/SoDlib/include/EffectPrototype.h b/SoDlib/include/EffectPrototype.h
@@ -19,5 +19,5 @@ class EffectPrototype
 		int type;
 	private:
 };
-
+#define EFFECTPROTOTYPE_H_COMPLETE
 #endif // EFFECTPROTOTYPE_H
diff --git a/SoDlib/include/HotSpotEffect.h b/SoDlib/include/HotSpotEffect.h
@@ -1,8 +1,8 @@
+#include <SoDlib.h>
+#ifdef CHARACTER_H_COMPLETE
 #ifndef HOTSPOTEFFECT_H
 #define HOTSPOTEFFECT_H
 
-#include <SoDlib.h>
-
 
 class HotSpotEffect : public Effect
 {
@@ -15,3 +15,4 @@ class HotSpotEffect : public Effect
 };
 
 #endif // HOTSPOTEFFECT_H
+#endif
diff --git a/SoDlib/include/HotSpotEffectPrototype.h b/SoDlib/include/HotSpotEffectPrototype.h
@@ -1,8 +1,8 @@
+#include <SoDlib.h>
+#ifdef EFFECTPROTOTYPE_H_COMPLETE
 #ifndef HOTSPOTEFFECTPROTOTYPE_H
 #define HOTSPOTEFFECTPROTOTYPE_H
 
-#include <SoDlib.h>
-
 
 class HotSpotEffectPrototype : public EffectPrototype
 {
@@ -17,3 +17,4 @@ class HotSpotEffectPrototype : public EffectPrototype
 };
 
 #endif // HOTSPOTEFFECTPROTOTYPE_H
+#endif
diff --git a/SoDlib/include/RectangularEffect.h b/SoDlib/include/RectangularEffect.h
@@ -1,8 +1,8 @@
+#include <SoDlib.h>
+#ifdef CHARACTER_H_COMPLETE
 #ifndef RECTANGULAREFFECT_H
 #define RECTANGULAREFFECT_H
 
-#include <SoDlib.h>
-
 
 class RectangularEffect : public Effect
 {
@@ -15,3 +15,4 @@ class RectangularEffect : public Effect
 };
 
 #endif // RECTANGULAREFFECT_H
+#endif
diff --git a/SoDlib/include/SoDlib.h b/SoDlib/include/SoDlib.h
@@ -13,11 +13,17 @@ class GroundLine;
 class Platform;
 class MapAnimation;
 class DebugDraw;
+class EffectPrototype;
+class Effect;
+class RectangularEffect;
+class HotSpotEffect;
 class Game;
 class hgeGUIMenuItem;
 
 typedef bool (*menuCallback)(hgeGUIMenuItem* sender);
 
+#include <string>
+
 #include <hge.h>
 #include <hgeanim.h>
 #include <hgegui.h>

diff --git a/SoDlib/src/Game.cpp b/SoDlib/src/Game.cpp
@@ -100,7 +100,7 @@ bool Game::preload()
 bool Game::loadEffectPrototypes(char* fileName)
 {
 	printf("loading effect prototypes %s ... \n", fileName);
-    TiXmlDocument doc(fn);
+    TiXmlDocument doc(fileName);
     bool loadOkay = doc.LoadFile();
     if (loadOkay) {
     	TiXmlElement* root = doc.FirstChildElement("effect_prototypes");
@@ -115,10 +115,10 @@ bool Game::loadEffectPrototypes(char* fileName)
 			EffectPrototype* newObject;
 			switch (type) {
 				case EFFECT_TYPE_RECTANGULAR:
-					newObject = new RectangularEffectPrototype;
+					newObject = new RectangularEffectPrototype();
 					break;
 				case EFFECT_TYPE_HOTSPOT:
-					newObject = new HotSpotEffectPrototype;
+					newObject = new HotSpotEffectPrototype();
 					break;
 			}
             newObject->loadFromXml(element);