diff options
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 1c51b2a..e4aa9bd 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1,6 +1,9 @@ //#include <cstdlib> #include <cmath> +#include <math.h> +#if !defined(WIN) || defined(__GNUC__) #include <strings.h> +#endif #include "Config.h" #include "Simulation.h" #include "Elements.h" @@ -1093,6 +1096,7 @@ int Simulation::ToolBrush(int positionX, int positionY, int tool, Brush * cBrush if(bitmap[(y*sizeX)+x] && (positionX+(x-radiusX) >= 0 && positionY+(y-radiusY) >= 0 && positionX+(x-radiusX) < XRES && positionY+(y-radiusY) < YRES)) Tool(positionX+(x-radiusX), positionY+(y-radiusY), tool, strength); } + return 0; } void Simulation::ToolLine(int x1, int y1, int x2, int y2, int tool, Brush * cBrush, float strength) @@ -1660,7 +1664,7 @@ void *Simulation::transform_save(void *odata, int *size, matrix2d transform, vec return ndata; } -inline void Simulation::orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]) +TPT_NO_INLINE void Simulation::orbitalparts_get(int block1, int block2, int resblock1[], int resblock2[]) { resblock1[0] = (block1&0x000000FF); resblock1[1] = (block1&0x0000FF00)>>8; @@ -1673,7 +1677,7 @@ inline void Simulation::orbitalparts_get(int block1, int block2, int resblock1[] resblock2[3] = (block2&0xFF000000)>>24; } -inline void Simulation::orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]) +TPT_NO_INLINE void Simulation::orbitalparts_set(int *block1, int *block2, int resblock1[], int resblock2[]) { int block1tmp = 0; int block2tmp = 0; @@ -3952,11 +3956,7 @@ killed: if (!parts[i].vx&&!parts[i].vy)//if its not moving, skip to next particle, movement code it next continue; -#if defined(WIN) && !defined(__GNUC__) - mv = max(fabsf(parts[i].vx), fabsf(parts[i].vy)); -#else mv = fmaxf(fabsf(parts[i].vx), fabsf(parts[i].vy)); -#endif if (mv < ISTP) { clear_x = x; |