X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ABM2%2FEngine%2Fengine.h;h=78a7e8be49c9e9b8279b06bb4f1d3dad5465ded9;hb=736410d1c7278c0d3290f0cb67705473c87cb3c5;hp=9fe5375978acdeb6372712808d668455feaeaa3a;hpb=0835c5605c80efd286ccb7eff92fffc07689f359;p=matthijs%2FABM2.git diff --git a/ABM2/Engine/engine.h b/ABM2/Engine/engine.h index 9fe5375..78a7e8b 100755 --- a/ABM2/Engine/engine.h +++ b/ABM2/Engine/engine.h @@ -3,7 +3,6 @@ #pragma warning ( disable : 4786 ) - #include #include #include @@ -24,6 +23,7 @@ #ifdef WIN32 #include #endif +#include "porting.h" //even though resource.h is technically a Win32-resource file, it's just a bunch of defines, so it's ok (and necessary) #include "resource.h" @@ -37,25 +37,35 @@ #include */ //foundation layer headers -#include "log.h" +#include "Log.h" #include "mmanager.h" #include "singleton.h" #include "functor.h" #include "dator.h" -#include "kernel.h" -#include "settings.h" +#include "Kernel.h" +#include "Settings.h" #include "profiler.h" -#include "profileloghandler.h" +#include "ProfileLogHandler.h" //task pool -#include "videoupdate.h" -#include "globalTimer.h" -#include "inputtask.h" -#include "soundtask.h" +#include "VideoUpdate.h" +#include "GlobalTimer.h" +#include "InputTask.h" +#include "SoundTask.h" //misc #include "misc.h" #include "math.h" -#endif \ No newline at end of file +/** Where should this be? */ +enum SpriteID { + SPR_NONE = 0, + SPR_FIELD, + SPR_SOLID, + SPR_BRICK, + SPR_BLANK, + SPR_PLAYER, +}; + +#endif