diff --git a/SoDlib/SoDLib.depend b/SoDlib/SoDLib.depend index 6d956ed..c640297 100644 --- a/SoDlib/SoDLib.depend +++ b/SoDlib/SoDLib.depend @@ -1 +1,407 @@ # depslib dependency file v1.0 +1378195931 source:d:\git\sod\sodlib\hgeanim.cpp + + +1378195935 d:\git\sod\hge181\include\hgeanim.h + "hgesprite.h" + +1378195935 d:\git\sod\hge181\include\hgesprite.h + "hge.h" + "hgerect.h" + +1378195935 d:\git\sod\hge181\include\hge.h + + +1378195935 d:\git\sod\hge181\include\hgerect.h + +1378195931 source:d:\git\sod\sodlib\hgecolor.cpp + + + +1378195935 d:\git\sod\hge181\include\hgecolor.h + "hge.h" + +1378195931 source:d:\git\sod\sodlib\hgefont.cpp + + + + +1378195935 d:\git\sod\hge181\include\hgefont.h + "hge.h" + "hgesprite.h" + +1378195931 source:d:\git\sod\sodlib\hgegui.cpp + + +1378195935 d:\git\sod\hge181\include\hgegui.h + "hge.h" + "hgesprite.h" + "hgerect.h" + +1378195931 source:d:\git\sod\sodlib\hgeguictrls.cpp + + + + + +1378195935 d:\git\sod\hge181\include\hgeguictrls.h + "hge.h" + "hgesprite.h" + "hgefont.h" + "hgerect.h" + "hgegui.h" + +1378195931 source:d:\git\sod\sodlib\hgerect.cpp + + + +1378195931 source:d:\git\sod\sodlib\hgesprite.cpp + + + +1378195931 source:d:\git\sod\sodlib\src\animation.cpp + "Animation.h" + +1378195931 d:\git\sod\sodlib\include\animation.h + + +1381739803 d:\git\sod\sodlib\include\sodlib.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +1378195931 d:\git\sod\box2d\box2d.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + +1378195931 d:\git\sod\box2d\common\b2settings.h + + + +1378195931 d:\git\sod\box2d\common\b2draw.h + + +1378195931 d:\git\sod\box2d\common\b2math.h + + + + + + +1378195931 d:\git\sod\box2d\common\b2timer.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2circleshape.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2shape.h + + + + +1378195931 d:\git\sod\box2d\common\b2blockallocator.h + + +1378195931 d:\git\sod\box2d\collision\b2collision.h + + + +1378195931 d:\git\sod\box2d\collision\shapes\b2edgeshape.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2chainshape.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2polygonshape.h + + +1378195931 d:\git\sod\box2d\collision\b2broadphase.h + + + + + +1378195931 d:\git\sod\box2d\collision\b2dynamictree.h + + + +1378195931 d:\git\sod\box2d\common\b2growablestack.h + + + +1378195931 d:\git\sod\box2d\collision\b2distance.h + + +1378195931 d:\git\sod\box2d\collision\b2timeofimpact.h + + + +1378195931 d:\git\sod\box2d\dynamics\b2body.h + + + + +1378195931 d:\git\sod\box2d\dynamics\b2fixture.h + + + + +1378195931 d:\git\sod\box2d\dynamics\b2worldcallbacks.h + + +1378195931 d:\git\sod\box2d\dynamics\b2timestep.h + + +1378195931 d:\git\sod\box2d\dynamics\b2world.h + + + + + + + +1378195931 d:\git\sod\box2d\common\b2stackallocator.h + + +1378195931 d:\git\sod\box2d\dynamics\b2contactmanager.h + + +1378195931 d:\git\sod\box2d\dynamics\contacts\b2contact.h + + + + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2distancejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2joint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2frictionjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2gearjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2wheeljoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2mousejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2prismaticjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2pulleyjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2revolutejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2ropejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2weldjoint.h + + +1378195931 d:\git\sod\sodlib\include\tinyxml.h + + + + + + + + + "tinystr.h" + +1378195931 d:\git\sod\sodlib\include\tinystr.h + + + +1378195931 d:\git\sod\sodlib\include\exception.h + + + +1381739067 d:\git\sod\sodlib\include\game.h + + +1378195931 d:\git\sod\sodlib\include\construction.h + + +1381740198 d:\git\sod\sodlib\include\effectprototype.h + + +1381740172 d:\git\sod\sodlib\include\hotspoteffectprototype.h + + +1381739845 d:\git\sod\sodlib\include\effect.h + + +1381739893 d:\git\sod\sodlib\include\rectangulareffect.h + + +1381739920 d:\git\sod\sodlib\include\hotspoteffect.h + + +1378195931 d:\git\sod\sodlib\include\characteractioncause.h + + +1378195931 d:\git\sod\sodlib\include\characteractioneffect.h + + +1378195931 d:\git\sod\sodlib\include\characteraction.h + + +1381739067 d:\git\sod\sodlib\include\characterhotspot.h + + +1380271277 d:\git\sod\sodlib\include\character.h + + +1378195931 d:\git\sod\sodlib\include\nonplayercharacter.h + + +1378195931 d:\git\sod\sodlib\include\playercharacter.h + + +1380271041 d:\git\sod\sodlib\include\groundline.h + + +1380271364 d:\git\sod\sodlib\include\platform.h + + +1380271151 d:\git\sod\sodlib\include\mapanimation.h + + +1378195931 d:\git\sod\sodlib\include\debugdraw.h + + +1378195931 d:\git\sod\sodlib\include\guiwindow.h + + + +1378195931 d:\git\sod\sodlib\include\hgeguimenuitem.h + + +1380271327 source:d:\git\sod\sodlib\src\character.cpp + "Character.h" + +1378195931 source:d:\git\sod\sodlib\src\characteraction.cpp + "CharacterAction.h" + +1378195931 source:d:\git\sod\sodlib\src\characteractioncause.cpp + "CharacterActionCause.h" + +1378195931 source:d:\git\sod\sodlib\src\characteractioneffect.cpp + "CharacterActionEffect.h" + +1378195931 source:d:\git\sod\sodlib\src\characterhotspot.cpp + "CharacterHotSpot.h" + +1378195931 source:d:\git\sod\sodlib\src\construction.cpp + "Construction.h" + +1378195931 source:d:\git\sod\sodlib\src\debugdraw.cpp + "DebugDraw.h" + +1378195931 source:d:\git\sod\sodlib\src\exception.cpp + "Exception.h" + +1380271691 source:d:\git\sod\sodlib\src\groundline.cpp + "GroundLine.h" + +1378195931 source:d:\git\sod\sodlib\src\guiwindow.cpp + "GUIWindow.h" + +1378195931 source:d:\git\sod\sodlib\src\hgeguimenuitem.cpp + "hgeGUIMenuItem.h" + +1380271186 source:d:\git\sod\sodlib\src\mapanimation.cpp + "MapAnimation.h" + +1378195931 source:d:\git\sod\sodlib\src\nonplayercharacter.cpp + "NonPlayerCharacter.h" + +1380271811 source:d:\git\sod\sodlib\src\platform.cpp + "Platform.h" + +1378195931 source:d:\git\sod\sodlib\src\playercharacter.cpp + "PlayerCharacter.h" + +1378195931 source:d:\git\sod\sodlib\tinystr.cpp + "tinystr.h" + +1378293644 source:d:\git\sod\sodlib\tinyxml.cpp + + + + "tinyxml.h" + +1378195931 source:d:\git\sod\sodlib\tinyxmlerror.cpp + "tinyxml.h" + +1378195931 source:d:\git\sod\sodlib\tinyxmlparser.cpp + + + "tinyxml.h" + + +1381739067 source:d:\git\sod\sodlib\src\effect.cpp + "Effect.h" + +1381739067 source:d:\git\sod\sodlib\src\effectprototype.cpp + "EffectPrototype.h" + diff --git a/SoDlib/include/Effect.h b/SoDlib/include/Effect.h index 6fd17be..c1ee557 100644 --- 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 index 4249345..ee96fb1 100644 --- 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 index 1b6607a..d12749c 100644 --- a/SoDlib/include/HotSpotEffect.h +++ b/SoDlib/include/HotSpotEffect.h @@ -1,8 +1,8 @@ +#include +#ifdef CHARACTER_H_COMPLETE #ifndef HOTSPOTEFFECT_H #define HOTSPOTEFFECT_H -#include - 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 index f94bee4..257a23b 100644 --- a/SoDlib/include/HotSpotEffectPrototype.h +++ b/SoDlib/include/HotSpotEffectPrototype.h @@ -1,8 +1,8 @@ +#include +#ifdef EFFECTPROTOTYPE_H_COMPLETE #ifndef HOTSPOTEFFECTPROTOTYPE_H #define HOTSPOTEFFECTPROTOTYPE_H -#include - 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 index 1aba9b5..8f16829 100644 --- a/SoDlib/include/RectangularEffect.h +++ b/SoDlib/include/RectangularEffect.h @@ -1,8 +1,8 @@ +#include +#ifdef CHARACTER_H_COMPLETE #ifndef RECTANGULAREFFECT_H #define RECTANGULAREFFECT_H -#include - 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 index 8657cbb..0915be7 100644 --- 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 + #include #include #include diff --git a/SoDlib/src/Game.cpp b/SoDlib/src/Game.cpp index 8534e25..ce3dad9 100644 --- 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);