diff options
| author | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-12 02:38:43 (GMT) |
|---|---|---|
| committer | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-12 02:38:43 (GMT) |
| commit | c23938eb6a2fd6b01386a398c14d4bfe37d4b4ca (patch) | |
| tree | c7b6ebde9af7da3e1e04442d5adeb674966faa77 /src | |
| parent | bf1d90d7c3283b9a145ea98d6b1802465ea259b4 (diff) | |
| download | powder-c23938eb6a2fd6b01386a398c14d4bfe37d4b4ca.zip powder-c23938eb6a2fd6b01386a398c14d4bfe37d4b4ca.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics.c | 10 | ||||
| -rw-r--r-- | src/interface.c | 4 | ||||
| -rw-r--r-- | src/main.c | 22 | ||||
| -rw-r--r-- | src/powder.c | 1 |
4 files changed, 25 insertions, 12 deletions
diff --git a/src/graphics.c b/src/graphics.c index c56d067..8bd9c28 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1328,8 +1328,14 @@ void draw_parts(pixel *vid) nx = (int)(parts[i].x+0.5f); ny = (int)(parts[i].y+0.5f); - - if(cmode!=CM_HEAT) + if(cmode==7)//nothing display + { + 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 { diff --git a/src/interface.c b/src/interface.c index 45d1efd..9c32c5c 100644 --- a/src/interface.c +++ b/src/interface.c @@ -548,6 +548,8 @@ void draw_svf_ui(pixel *vid_buf) break; case 6: 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; } 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) strcpy(itc_msg, "Pressure Display"); + else if(cmode==7) + strcpy(itc_msg, "Cracker Display"); else strcpy(itc_msg, "Velocity Display"); } @@ -1266,12 +1266,16 @@ int main(int argc, char *argv[]) { set_cmode(6); } + if(sdl_key=='8') + { + set_cmode(7); + } if(sdl_key==SDLK_LEFTBRACKET) { if(sdl_zoom_trig==1) { ZSIZE -= 1; - if(ZSIZE>32) - ZSIZE = 32; + if(ZSIZE>60) + ZSIZE = 60; if(ZSIZE<2) ZSIZE = 2; ZFACTOR = 256/ZSIZE; @@ -1292,8 +1296,8 @@ int main(int argc, char *argv[]) if(sdl_zoom_trig==1) { ZSIZE += 1; - if(ZSIZE>32) - ZSIZE = 32; + if(ZSIZE>60) + ZSIZE = 60; if(ZSIZE<2) ZSIZE = 2; ZFACTOR = 256/ZSIZE; @@ -1345,7 +1349,7 @@ int main(int argc, char *argv[]) } else if(sdl_key=='c') { - set_cmode((cmode+1) % 7); + set_cmode((cmode+1) % 8); if(it > 50) it = 50; } @@ -1382,8 +1386,8 @@ int main(int argc, char *argv[]) if(sdl_zoom_trig==1) { ZSIZE += sdl_wheel; - if(ZSIZE>32) - ZSIZE = 32; + if(ZSIZE>60) + ZSIZE = 60; if(ZSIZE<2) ZSIZE = 2; 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(b & SDL_BUTTON_LMASK) - set_cmode((cmode+1) % 7); + set_cmode((cmode+1) % 8); if(b & SDL_BUTTON_RMASK) - set_cmode((cmode+6) % 7); + set_cmode((cmode+7) % 8); save_presets(0); } if(x>=(XRES+BARSIZE-(510-494)) && x<=(XRES+BARSIZE-(510-509)) && !bq) diff --git a/src/powder.c b/src/powder.c index edc8f9e..97e6ae7 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1991,7 +1991,6 @@ void update_particles_i(pixel *vid, int start, int inc) { create_part(-1,x+nx,y+ny,PT_WTRV); parts[i].life--; - parts[r>>8].temp = parts[i].temp; parts[i].temp -= 40.0f; } } |