summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-12-30 02:06:53 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-12-30 02:06:53 (GMT)
commit5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f (patch)
tree3000d7b1d85f6a031181454377f2c0920d319868 /src/main.c
parent86369670aaa11b8cd2ddcbd46413fb9482e4e58f (diff)
parentf04577598b48c9e294b102395afc94023df8c92c (diff)
downloadpowder-5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f.zip
powder-5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index a835e3e..5abc139 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1014,7 +1014,7 @@ int main(int argc, char *argv[])
gravity_update_async(); //Check for updated velocity maps from gravity thread
if (!sys_pause||framerender) //Only update if not paused
- memset(gravmap, 0, sizeof(gravmap)); //Clear the old gravmap
+ memset(gravmap, 0, (XRES/CELL)*(YRES/CELL)*sizeof(float)); //Clear the old gravmap
if (framerender) {
framerender = 0;
@@ -2258,8 +2258,7 @@ int main(int argc, char *argv[])
if (!bq)
add_sign_ui(vid_buf, x, y);
}
-
- if (c==PT_FIGH)
+ else if (c==PT_FIGH)
{
if (!bq)
create_part(-1, x, y, PT_FIGH);