summaryrefslogtreecommitdiff
path: root/src/powder.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-02-13 13:42:38 (GMT)
committer Simon <simon@hardwired.org.uk>2011-02-13 13:42:38 (GMT)
commitb0b736d49ee09a476f4562e6cb6c66befd18bc36 (patch)
tree4117e3ea80664414f69d794121fb579e1243249c /src/powder.c
parentd57c5ef5e0bbbc21a8f4e9f5bd9281348b0be11f (diff)
downloadpowder-b0b736d49ee09a476f4562e6cb6c66befd18bc36.zip
powder-b0b736d49ee09a476f4562e6cb6c66befd18bc36.tar.gz
Moved Gravity identifiers, added gravity mode and air mode to save format
Diffstat (limited to 'src/powder.c')
-rw-r--r--src/powder.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/src/powder.c b/src/powder.c
index 1d4df9b..dc36054 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -12,7 +12,7 @@ float player2[27];
particle *parts;
particle *cb_parts;
-int gravityMode = 1; // starts enabled in "vertical" mode...
+int gravityMode = 0; // starts enabled in "vertical" mode...
int airMode = 0;
@@ -1442,21 +1442,18 @@ void update_particles_i(pixel *vid, int start, int inc)
//Gravity mode by Moach
switch (gravityMode)
{
- default:
- case 0:
- pGravX = pGravY = 0.0f;
- break;
- case 1:
- pGravX = 0.0f;
- pGravY = ptypes[t].gravity;
- break;
- case 2:
-
- pGravD = 0.01f - hypotf((x - XCNTR), (y - YCNTR));
-
- pGravX = ptypes[t].gravity * ((float)(x - XCNTR) / pGravD);
- pGravY = ptypes[t].gravity * ((float)(y - YCNTR) / pGravD);
-
+ default:
+ case 0:
+ pGravX = 0.0f;
+ pGravY = ptypes[t].gravity;
+ break;
+ case 1:
+ pGravX = pGravY = 0.0f;
+ break;
+ case 2:
+ pGravD = 0.01f - hypotf((x - XCNTR), (y - YCNTR));
+ pGravX = ptypes[t].gravity * ((float)(x - XCNTR) / pGravD);
+ pGravY = ptypes[t].gravity * ((float)(y - YCNTR) / pGravD);
}
parts[i].vx *= ptypes[t].loss;