diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-09-02 22:24:29 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-09-05 00:40:17 (GMT) |
| commit | 5892c745955fb3afeb69176a1233efb7eb3751b4 (patch) | |
| tree | 0256dc1ccfb9add81a52ed56892842ed990d1bdc /src | |
| parent | 3d5d10b1edb25b8910427759acac1361aabd6555 (diff) | |
| download | powder-5892c745955fb3afeb69176a1233efb7eb3751b4.zip powder-5892c745955fb3afeb69176a1233efb7eb3751b4.tar.gz | |
Visual Studio fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/stkm.c | 5 | ||||
| -rw-r--r-- | src/interface.c | 2 | ||||
| -rw-r--r-- | src/main.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c index ad197ef..a96de2a 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -17,6 +17,8 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) { int r, rx, ry; float pp, d; float dt = 0.9;///(FPSB*FPSB); //Delta time in square + float gvx, gvy; + float gx, gy, dl, dr; if ((parts[i].ctype>0 && parts[i].ctype<PT_NUM && ptypes[parts[i].ctype].falldown>0) || parts[i].ctype==SPC_AIR || parts[i].ctype == PT_NEUT || parts[i].ctype == PT_PHOT) playerp[2] = parts[i].ctype; @@ -42,7 +44,6 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) { } //Follow gravity - float gvx, gvy; gvx = gvy = 0.0f; switch (gravityMode) { @@ -110,8 +111,6 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) { playerp[25] = 0; playerp[26] = 0; - float gx, gy, dl, dr; - gx = (playerp[7] + playerp[15])/2 - gvy; gy = (playerp[8] + playerp[16])/2 + gvx; dl = pow(gx - playerp[7], 2) + pow(gy - playerp[8], 2); diff --git a/src/interface.c b/src/interface.c index 5f78eed..3370883 100644 --- a/src/interface.c +++ b/src/interface.c @@ -3322,9 +3322,9 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date) ui_edit ed; ui_copytext ctb; - viewcountbuffer[0] = 0; pixel *old_vid=(pixel *)calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); fillrect(vid_buf, -1, -1, XRES+BARSIZE, YRES+MENUSIZE, 0, 0, 0, 192); + viewcountbuffer[0] = 0; fillrect(vid_buf, 50, 50, XRES+BARSIZE-100, YRES+MENUSIZE-100, 0, 0, 0, 255); drawrect(vid_buf, 50, 50, XRES+BARSIZE-100, YRES+MENUSIZE-100, 255, 255, 255, 255); @@ -1564,7 +1564,6 @@ int main(int argc, char *argv[]) #else int main(int argc, char *argv[]) { - limitFPS = 60; pixel *part_vbuf; //Extra video buffer pixel *part_vbuf_store; #ifdef BETA @@ -1597,6 +1596,7 @@ int main(int argc, char *argv[]) pthread_win32_process_attach_np(); pthread_win32_thread_attach_np(); #endif + limitFPS = 60; vid_buf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); part_vbuf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); //Extra video buffer part_vbuf_store = part_vbuf; @@ -2585,8 +2585,8 @@ int main(int argc, char *argv[]) else if ((cr&0xFF)==PT_LAVA && parts[cr>>8].ctype > 0 && parts[cr>>8].ctype < PT_NUM ) { char lowername[6]; - strcpy(lowername, ptypes[parts[cr>>8].ctype].name); int ix; + strcpy(lowername, ptypes[parts[cr>>8].ctype].name); for (ix = 0; lowername[ix]; ix++) lowername[ix] = tolower(lowername[ix]); |