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

fix compiling

Browse Source
This commit is contained in:
Jacob1 2012-05-23 18:54:25 -04:00
parent a1b7b02f81
commit 2656bcec2b
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/elements/gel.c
View File

@ -17,6 +17,8 @@
int update_GEL(UPDATE_FUNC_ARGS) { int update_GEL(UPDATE_FUNC_ARGS) {
int r, rx, ry; int r, rx, ry;
float dx, dy;
char gel;
if (parts[i].tmp>100) parts[i].tmp = 100; if (parts[i].tmp>100) parts[i].tmp = 100;
if (parts[i].tmp<0) parts[i].tmp = 0; if (parts[i].tmp<0) parts[i].tmp = 0;
for (rx=-2; rx<3; rx++) for (rx=-2; rx<3; rx++)
@ -41,7 +43,7 @@ int update_GEL(UPDATE_FUNC_ARGS) {
parts[i].tmp++; parts[i].tmp++;
} }
char gel = 0; gel = 0;
if ((r&0xFF)==PT_GEL) if ((r&0xFF)==PT_GEL)
gel = 1; gel = 1;
@ -58,7 +60,6 @@ int update_GEL(UPDATE_FUNC_ARGS) {
parts[i].tmp--; parts[i].tmp--;
} }
float dx, dy;
dx = parts[i].x - parts[r>>8].x; dx = parts[i].x - parts[r>>8].x;
dy = parts[i].y - parts[r>>8].y; dy = parts[i].y - parts[r>>8].y;

4
src/main.c
View File

@ -770,6 +770,7 @@ int main(int argc, char *argv[])
unsigned int rgbSave = PIXRGB(127,0,0); unsigned int rgbSave = PIXRGB(127,0,0);
SDL_AudioSpec fmt; SDL_AudioSpec fmt;
int username_flash = 0, username_flash_t = 1; int username_flash = 0, username_flash_t = 1;
int saveOpenError = 0;
#ifdef PTW32_STATIC_LIB #ifdef PTW32_STATIC_LIB
pthread_win32_process_attach_np(); pthread_win32_process_attach_np();
pthread_win32_thread_attach_np(); pthread_win32_thread_attach_np();
@ -779,7 +780,6 @@ int main(int argc, char *argv[])
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;
pers_bg = calloc((XRES+BARSIZE)*YRES, PIXELSIZE); pers_bg = calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
int saveOpenError = 0;
gravity_init(); gravity_init();
GSPEED = 1; GSPEED = 1;
@ -902,12 +902,12 @@ int main(int argc, char *argv[])
} }
else if (!strncmp(argv[i], "ptsave", 7) && i+1<argc) else if (!strncmp(argv[i], "ptsave", 7) && i+1<argc)
{ {
puts("Got ptsave");
int ci = 0, ns = 0, okay = 0; int ci = 0, ns = 0, okay = 0;
char * tempString = argv[i+1]; char * tempString = argv[i+1];
int tempStringLength = strlen(argv[i+1])-7; int tempStringLength = strlen(argv[i+1])-7;
int tempSaveID = 0; int tempSaveID = 0;
char tempNumberString[32]; char tempNumberString[32];
puts("Got ptsave");
i++; i++;
tempNumberString[31] = 0; tempNumberString[31] = 0;
tempNumberString[0] = 0; tempNumberString[0] = 0;

4
src/powder.c
View File

@ -1440,7 +1440,7 @@ void create_arc(int sx, int sy, int dx, int dy, int midpoints, int variance, int
void update_particles_i(pixel *vid, int start, int inc) void update_particles_i(pixel *vid, int start, int inc)
{ {
int i, j, x, y, t, nx, ny, r, surround_space, s, lt, rt, nt, nnx, nny, q, golnum, goldelete, z, neighbors, createdsomething; int i, j, x, y, t, nx, ny, r, surround_space, s, lt, rt, nt, nnx, nny, q, golnum, goldelete, z, neighbors, createdsomething;
float mv, dx, dy, ix, iy, lx, ly, nrx, nry, dp, ctemph, ctempl, gravtot; float mv, dx, dy, ix, iy, lx, ly, nrx, nry, dp, ctemph, ctempl, gravtot, gel_scale;
int fin_x, fin_y, clear_x, clear_y, stagnant; int fin_x, fin_y, clear_x, clear_y, stagnant;
float fin_xf, fin_yf, clear_xf, clear_yf; float fin_xf, fin_yf, clear_xf, clear_yf;
float nn, ct1, ct2, swappage; float nn, ct1, ct2, swappage;
@ -1878,7 +1878,7 @@ void update_particles_i(pixel *vid, int start, int inc)
} }
} }
float gel_scale = 1.0f; gel_scale = 1.0f;
if (t==PT_GEL) if (t==PT_GEL)
gel_scale = parts[i].tmp*2.55f; gel_scale = parts[i].tmp*2.55f;