matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Visual Studio fixes

Browse Source
This commit is contained in:
jacksonmj 2011-09-03 06:24:29 +08:00 committed by Simon Robertshaw
parent 3d5d10b1ed
commit 5892c74595
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
font/unpacker.c
View File

@ -1,3 +1,5 @@
#ifdef FONTEDITOR
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -107,3 +109,5 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
#endif

2
includes/powder.h
View File

@ -739,7 +739,7 @@ static part_transition ptransitions[PT_NUM] =
/* PBCN */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* PBCN */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
/* GPMP */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* GPMP */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
/* CLST */ {IPL, NT, IPH, NT, ITL, NT, 1256.0f, PT_LAVA}, /* CLST */ {IPL, NT, IPH, NT, ITL, NT, 1256.0f, PT_LAVA},
/* WIRE */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT, PT_WIRE}, /* WIRE */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
/* GBMB */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* GBMB */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
}; };
#undef IPL #undef IPL

5
src/elements/stkm.c
View File

@ -17,6 +17,8 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
int r, rx, ry; int r, rx, ry;
float pp, d; float pp, d;
float dt = 0.9;///(FPSB*FPSB); //Delta time in square 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) 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; playerp[2] = parts[i].ctype;
@ -42,7 +44,6 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
} }
//Follow gravity //Follow gravity
float gvx, gvy;
gvx = gvy = 0.0f; gvx = gvy = 0.0f;
switch (gravityMode) switch (gravityMode)
{ {
@ -110,8 +111,6 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
playerp[25] = 0; playerp[25] = 0;
playerp[26] = 0; playerp[26] = 0;
float gx, gy, dl, dr;
gx = (playerp[7] + playerp[15])/2 - gvy; gx = (playerp[7] + playerp[15])/2 - gvy;
gy = (playerp[8] + playerp[16])/2 + gvx; gy = (playerp[8] + playerp[16])/2 + gvx;
dl = pow(gx - playerp[7], 2) + pow(gy - playerp[8], 2); dl = pow(gx - playerp[7], 2) + pow(gy - playerp[8], 2);

2
src/interface.c
View File

@ -3322,9 +3322,9 @@ int open_ui(pixel *vid_buf, char *save_id, char *save_date)
ui_edit ed; ui_edit ed;
ui_copytext ctb; ui_copytext ctb;
viewcountbuffer[0] = 0;
pixel *old_vid=(pixel *)calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); pixel *old_vid=(pixel *)calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
fillrect(vid_buf, -1, -1, XRES+BARSIZE, YRES+MENUSIZE, 0, 0, 0, 192); 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); 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); drawrect(vid_buf, 50, 50, XRES+BARSIZE-100, YRES+MENUSIZE-100, 255, 255, 255, 255);

4
src/main.c
View File

@ -1564,7 +1564,6 @@ int main(int argc, char *argv[])
#else #else
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
limitFPS = 60;
pixel *part_vbuf; //Extra video buffer pixel *part_vbuf; //Extra video buffer
pixel *part_vbuf_store; pixel *part_vbuf_store;
#ifdef BETA #ifdef BETA
@ -1597,6 +1596,7 @@ int main(int argc, char *argv[])
pthread_win32_process_attach_np(); pthread_win32_process_attach_np();
pthread_win32_thread_attach_np(); pthread_win32_thread_attach_np();
#endif #endif
limitFPS = 60;
vid_buf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); vid_buf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE);
part_vbuf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); //Extra video buffer part_vbuf = calloc((XRES+BARSIZE)*(YRES+MENUSIZE), PIXELSIZE); //Extra video buffer
part_vbuf_store = part_vbuf; 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 ) else if ((cr&0xFF)==PT_LAVA && parts[cr>>8].ctype > 0 && parts[cr>>8].ctype < PT_NUM )
{ {
char lowername[6]; char lowername[6];
strcpy(lowername, ptypes[parts[cr>>8].ctype].name);
int ix; int ix;
strcpy(lowername, ptypes[parts[cr>>8].ctype].name);
for (ix = 0; lowername[ix]; ix++) for (ix = 0; lowername[ix]; ix++)
lowername[ix] = tolower(lowername[ix]); lowername[ix] = tolower(lowername[ix]);