diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 16:59:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-10-23 16:59:04 (GMT) |
| commit | b549688fddecbf98b79183bae0d4894f5b1ab154 (patch) | |
| tree | 35f64d820c7c5cdf6be4b9e66f4ab82302a30a26 /src | |
| parent | 58d667281f9f450072bcd580030175252e404064 (diff) | |
| download | powder-b549688fddecbf98b79183bae0d4894f5b1ab154.zip powder-b549688fddecbf98b79183bae0d4894f5b1ab154.tar.gz | |
Compatibility with MSVC - devast8a
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/dest.c | 4 | ||||
| -rw-r--r-- | src/elements/emp.c | 4 | ||||
| -rw-r--r-- | src/graphics.c | 4 | ||||
| -rw-r--r-- | src/misc.c | 6 | ||||
| -rw-r--r-- | src/powder.c | 6 |
5 files changed, 13 insertions, 11 deletions
diff --git a/src/elements/dest.c b/src/elements/dest.c index 17ea2fe..772065a 100644 --- a/src/elements/dest.c +++ b/src/elements/dest.c @@ -1,7 +1,7 @@ #include <element.h> int update_DEST(UPDATE_FUNC_ARGS) { - int r,rx,ry; + int r,rx,ry,topv; rx=rand()%5-2; ry=rand()%5-2; @@ -45,7 +45,7 @@ int update_DEST(UPDATE_FUNC_ARGS) { { if (ptypes[r&0xFF].hconduct) parts[r>>8].temp = restrict_flt(parts[r>>8].temp+10000.0f, MIN_TEMP, MAX_TEMP); } - int topv=pv[y/CELL][x/CELL]/9+parts[r>>8].temp/900; + topv=pv[y/CELL][x/CELL]/9+parts[r>>8].temp/900; if (topv>40.0f) topv=40.0f; pv[y/CELL][x/CELL]+=40.0f+topv; diff --git a/src/elements/emp.c b/src/elements/emp.c index a4c6067..c47c902 100644 --- a/src/elements/emp.c +++ b/src/elements/emp.c @@ -1,7 +1,7 @@ #include <element.h> int update_EMP(UPDATE_FUNC_ARGS) { - int r,rx,ry,ok=0,t; + int r,rx,ry,ok=0,t,n,nx,ny; if (parts[i].life) return 0; for (rx=-2; rx<3; rx++) @@ -42,7 +42,7 @@ int update_EMP(UPDATE_FUNC_ARGS) { else if (rand()%120==0) part_change_type(r, rx, ry, PT_NTCT); } - int n,nx,ny; + for (nx=-2; nx<3; nx++) for (ny=-2; ny<3; ny++) if (rx+nx>=0 && ry+ny>=0 && rx+nx<XRES && ry+ny<YRES && (rx || ry)) diff --git a/src/graphics.c b/src/graphics.c index 2ca21cc..45b2de1 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1757,7 +1757,7 @@ void draw_parts(pixel *vid) int orbd[4] = {0, 0, 0, 0}; int orbl[4] = {0, 0, 0, 0}; int cr, cg, cb; - float fr, fg, fb; + float fr, fg, fb, div_n; float pt = R_TEMP; if (GRID_MODE)//draws the grid { @@ -3455,7 +3455,7 @@ void draw_parts(pixel *vid) addpixel(vid, nx, ny+newx, cr, cg, cb, gradv); addpixel(vid, nx, ny-newx, cr, cg, cb, gradv); - float div_n=1.2f-0.006*parts[i].life; + div_n=1.2f-0.006*parts[i].life; if (div_n<1.01f) div_n=1.01f; gradv = gradv/div_n; @@ -122,7 +122,9 @@ void save_presets(int do_update) { char * outputdata; cJSON *root, *userobj, *versionobj; - root = cJSON_CreateObject(); + FILE* f; + + root = cJSON_CreateObject(); cJSON_AddStringToObject(root, "Powder Toy Preferences", "Don't modify this file unless you know what you're doing. P.S: editing the admin/mod fields in your user info doesn't give you magical powers"); @@ -163,7 +165,7 @@ void save_presets(int do_update) outputdata = cJSON_Print(root); cJSON_Delete(root); - FILE *f = fopen("powder.pref", "wb"); + f = fopen("powder.pref", "wb"); if(!f) return; fwrite(outputdata, 1, strlen(outputdata), f); diff --git a/src/powder.c b/src/powder.c index bb91cd3..bf31b18 100644 --- a/src/powder.c +++ b/src/powder.c @@ -2613,11 +2613,11 @@ int flood_prop_2(int x, int y, size_t propoffset, void * propvalue, int proptype { i = pmap[y][x]>>8; if(proptype==2){ - *((float*)(((void*)&parts[i])+propoffset)) = *((float*)propvalue); + *((float*)(((char*)&parts[i])+propoffset)) = *((float*)propvalue); } else if(proptype==0) { - *((int*)(((void*)&parts[i])+propoffset)) = *((int*)propvalue); + *((int*)(((char*)&parts[i])+propoffset)) = *((int*)propvalue); } else if(proptype==1) { - *((char*)(((void*)&parts[i])+propoffset)) = *((char*)propvalue); + *((char*)(((char*)&parts[i])+propoffset)) = *((char*)propvalue); } bitmap[(y*XRES)+x] = 1; } |