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

Nothing display, for pilojo, called it cracker display for lulz, also won the race against antb, which didnt last long, he went on a baloon trip.

Browse Source
This commit is contained in:
Philip 2010-11-11 21:38:43 -05:00
parent bf1d90d7c3
commit c23938eb6a
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics.c
View File

@ -1328,8 +1328,14 @@ void draw_parts(pixel *vid)
nx = (int)(parts[i].x+0.5f); nx = (int)(parts[i].x+0.5f);
ny = (int)(parts[i].y+0.5f); ny = (int)(parts[i].y+0.5f);
if(cmode==7)//nothing display
if(cmode!=CM_HEAT) {
cr = PIXR(ptypes[t].pcolors);
cg = PIXG(ptypes[t].pcolors);
cb = PIXB(ptypes[t].pcolors);
blendpixel(vid, nx, ny, cr, cg, cb, 255);
}
else if(cmode!=CM_HEAT)
{ {
if(t==PT_STKM) //Just draw head here if(t==PT_STKM) //Just draw head here
{ {

4
src/interface.c
View File

@ -548,6 +548,8 @@ void draw_svf_ui(pixel *vid_buf)
break; break;
case 6: case 6:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xC4", 100, 150, 255, 255); drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xC4", 100, 150, 255, 255);
case 7:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xC4", 100, 150, 255, 255);
break; break;
} }
drawrect(vid_buf, XRES-32+BARSIZE/*478*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255); drawrect(vid_buf, XRES-32+BARSIZE/*478*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255);
@ -1769,6 +1771,8 @@ void set_cmode(int cm)
} }
else if(cmode==1) else if(cmode==1)
strcpy(itc_msg, "Pressure Display"); strcpy(itc_msg, "Pressure Display");
else if(cmode==7)
strcpy(itc_msg, "Cracker Display");
else else
strcpy(itc_msg, "Velocity Display"); strcpy(itc_msg, "Velocity Display");
} }

22
src/main.c
View File

@ -1266,12 +1266,16 @@ int main(int argc, char *argv[])
{ {
set_cmode(6); set_cmode(6);
} }
if(sdl_key=='8')
{
set_cmode(7);
}
if(sdl_key==SDLK_LEFTBRACKET) { if(sdl_key==SDLK_LEFTBRACKET) {
if(sdl_zoom_trig==1) if(sdl_zoom_trig==1)
{ {
ZSIZE -= 1; ZSIZE -= 1;
if(ZSIZE>32) if(ZSIZE>60)
ZSIZE = 32; ZSIZE = 60;
if(ZSIZE<2) if(ZSIZE<2)
ZSIZE = 2; ZSIZE = 2;
ZFACTOR = 256/ZSIZE; ZFACTOR = 256/ZSIZE;
@ -1292,8 +1296,8 @@ int main(int argc, char *argv[])
if(sdl_zoom_trig==1) if(sdl_zoom_trig==1)
{ {
ZSIZE += 1; ZSIZE += 1;
if(ZSIZE>32) if(ZSIZE>60)
ZSIZE = 32; ZSIZE = 60;
if(ZSIZE<2) if(ZSIZE<2)
ZSIZE = 2; ZSIZE = 2;
ZFACTOR = 256/ZSIZE; ZFACTOR = 256/ZSIZE;
@ -1345,7 +1349,7 @@ int main(int argc, char *argv[])
} }
else if(sdl_key=='c') else if(sdl_key=='c')
{ {
set_cmode((cmode+1) % 7); set_cmode((cmode+1) % 8);
if(it > 50) if(it > 50)
it = 50; it = 50;
} }
@ -1382,8 +1386,8 @@ int main(int argc, char *argv[])
if(sdl_zoom_trig==1) if(sdl_zoom_trig==1)
{ {
ZSIZE += sdl_wheel; ZSIZE += sdl_wheel;
if(ZSIZE>32) if(ZSIZE>60)
ZSIZE = 32; ZSIZE = 60;
if(ZSIZE<2) if(ZSIZE<2)
ZSIZE = 2; ZSIZE = 2;
ZFACTOR = 256/ZSIZE; ZFACTOR = 256/ZSIZE;
@ -1782,9 +1786,9 @@ int main(int argc, char *argv[])
if(x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq) if(x>=(XRES+BARSIZE-(510-476)) && x<=(XRES+BARSIZE-(510-491)) && !bq)
{ {
if(b & SDL_BUTTON_LMASK) if(b & SDL_BUTTON_LMASK)
set_cmode((cmode+1) % 7); set_cmode((cmode+1) % 8);
if(b & SDL_BUTTON_RMASK) if(b & SDL_BUTTON_RMASK)
set_cmode((cmode+6) % 7); set_cmode((cmode+7) % 8);
save_presets(0); save_presets(0);
} }
if(x>=(XRES+BARSIZE-(510-494)) && x<=(XRES+BARSIZE-(510-509)) && !bq) if(x>=(XRES+BARSIZE-(510-494)) && x<=(XRES+BARSIZE-(510-509)) && !bq)

1
src/powder.c
View File

@ -1991,7 +1991,6 @@ void update_particles_i(pixel *vid, int start, int inc)
{ {
create_part(-1,x+nx,y+ny,PT_WTRV); create_part(-1,x+nx,y+ny,PT_WTRV);
parts[i].life--; parts[i].life--;
parts[r>>8].temp = parts[i].temp;
parts[i].temp -= 40.0f; parts[i].temp -= 40.0f;
} }
} }