summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-05-17 10:37:13 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-05-19 14:53:24 (GMT)
commit603844f97f5ba22c1bc0ce6f4e6f51aa9af1ebfb (patch)
tree445abaf078bfaa1129d74e6c659ee7d984f84f9e /src
parent7482e4d07134b1ef8b1d0715f49396dbf525523b (diff)
downloadpowder-603844f97f5ba22c1bc0ce6f4e6f51aa9af1ebfb.zip
powder-603844f97f5ba22c1bc0ce6f4e6f51aa9af1ebfb.tar.gz
Fix DEUT explosion
Diffstat (limited to 'src')
-rw-r--r--src/elements/neut.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/elements/neut.c b/src/elements/neut.c
index 436a9dc..9e77898 100644
--- a/src/elements/neut.c
+++ b/src/elements/neut.c
@@ -1,8 +1,11 @@
#include <element.h>
+#if defined(WIN32) && !defined(__GNUC__)
+_inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)
+#else
inline int create_n_parts(int n, int x, int y, float vx, float vy, int t)//testing a new deut create part
-
+#endif
{
int i, c;
n = (n/50);
@@ -80,7 +83,7 @@ int update_NEUT(UPDATE_FUNC_ARGS) {
#ifdef SDEUT
else if ((r&0xFF)==PT_DEUT && (pressureFactor+1+(parts[i].life/100))>(rand()%1000))
{
- //create_n_parts(parts[r>>8].life, x+rx, y+ry, parts[i].vx, parts[i].vy, PT_NEUT);
+ create_n_parts(parts[r>>8].life, x+rx, y+ry, parts[i].vx, parts[i].vy, PT_NEUT);
kill_part(r>>8);
}
#else