summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-06-09 18:46:41 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-06-11 12:00:42 (GMT)
commit93316a9f1d687a86558daef529d583f5ae2be992 (patch)
treeae98719e4fe31f5a06a30a54208ce85ec200b5ae /src/main.c
parent7ae52660f58188a1bc9d8e69ff2711c6737c7e66 (diff)
downloadpowder-93316a9f1d687a86558daef529d583f5ae2be992.zip
powder-93316a9f1d687a86558daef529d583f5ae2be992.tar.gz
Fix a load of memory leaks
Also fix some compiler warnings (missing headers, wrong pointer type for modf, etc) and move variable declarations for Visual Studio.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 5a22208..ea32d3a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1378,7 +1378,7 @@ int set_scale(int scale, int kiosk){
return 1;
}
-void update_grav_async()
+void* update_grav_async(void* unused)
{
int done = 0;
int thread_done = 0;
@@ -2044,7 +2044,7 @@ int main(int argc, char *argv[])
free(load_data);
}
}
- if (sdl_key=='s' && (sdl_mod & (KMOD_CTRL)) || (sdl_key=='s' && !isplayer2))
+ if (sdl_key=='s' && ((sdl_mod & (KMOD_CTRL)) || !isplayer2))
{
if (it > 50)
it = 50;
@@ -2178,7 +2178,7 @@ int main(int argc, char *argv[])
bsy = 0;
}
}
- if (sdl_key=='d'&&(sdl_mod & (KMOD_CTRL)) || (sdl_key=='d' && !isplayer2))
+ if (sdl_key=='d' && ((sdl_mod & (KMOD_CTRL)) || !isplayer2))
DEBUG_MODE = !DEBUG_MODE;
if (sdl_key=='i')
{