diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-06 23:49:50 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-06 23:53:29 (GMT) |
| commit | 5a91b83875c8a25e36ecdcddb6c79de61125da39 (patch) | |
| tree | fdaa6d76756ca7164f913726fdeba22ec1aef4be /src/simulation | |
| parent | 710583f0fc00184e15404d4551abf9a424275452 (diff) | |
| download | powder-5a91b83875c8a25e36ecdcddb6c79de61125da39.zip powder-5a91b83875c8a25e36ecdcddb6c79de61125da39.tar.gz | |
revert changing the lua/sdl includes and min/max changes
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/Element.h | 3 | ||||
| -rw-r--r-- | src/simulation/Simulation.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/elements/SPRK.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/simulation/Element.h b/src/simulation/Element.h index 3c28e2f..d9c7903 100644 --- a/src/simulation/Element.h +++ b/src/simulation/Element.h @@ -8,6 +8,9 @@ #include "Gravity.h" #include "Misc.h" #include "ElementGraphics.h" +#ifdef _MSC_VER +#include <Windows.h> +#endif #define IPL -257.0f #define IPH 257.0f diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index e4aa9bd..195676c 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1,8 +1,10 @@ //#include <cstdlib> #include <cmath> #include <math.h> -#if !defined(WIN) || defined(__GNUC__) +#if !defined(_MSC_VER) #include <strings.h> +#else +#include <windows.h> #endif #include "Config.h" #include "Simulation.h" diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp index d1cbc17..c2f5a38 100644 --- a/src/simulation/elements/SPRK.cpp +++ b/src/simulation/elements/SPRK.cpp @@ -277,11 +277,9 @@ int Element_SPRK::graphics(GRAPHICS_FUNC_ARGS) { *firea = 80; - *firer = 170; *fireg = 200; *fireb = 220; - //*pixel_mode |= FIRE_ADD; *pixel_mode |= FIRE_ADD; return 1; } |