From 00d604820d4900a422efd43dd3dd0a6f225e4adf Mon Sep 17 00:00:00 2001 From: savask Date: Mon, 29 Aug 2011 23:47:22 +0700 Subject: [PATCH] Added fighters. --- includes/powder.h | 9 +- src/elements/figh.c | 7 + src/graphics.c | 1189 +++++++++++++++++++++++-------------------- src/main.c | 10 +- src/powder.c | 64 ++- 5 files changed, 727 insertions(+), 552 deletions(-) create mode 100644 src/elements/figh.c diff --git a/includes/powder.h b/includes/powder.h index 4e15dccf5..9bc823a48 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -210,7 +210,8 @@ #define PT_CLST 155 #define PT_WIRE 156 #define PT_GBMB 157 -#define PT_NUM 158 +#define PT_FIGH 158 +#define PT_NUM 159 #define R_TEMP 22 #define MAX_TEMP 9999 @@ -327,6 +328,7 @@ int update_CLST(UPDATE_FUNC_ARGS); int update_DLAY(UPDATE_FUNC_ARGS); int update_WIRE(UPDATE_FUNC_ARGS); int update_GBMB(UPDATE_FUNC_ARGS); +int update_FIGH(UPDATE_FUNC_ARGS); int update_CO2(UPDATE_FUNC_ARGS); int update_CBNW(UPDATE_FUNC_ARGS); int update_STOR(UPDATE_FUNC_ARGS); @@ -574,6 +576,7 @@ static const part_type ptypes[PT_NUM] = {"CLST", PIXPACK(0xE4A4A4), 0.7f, 0.02f * CFDS, 0.94f, 0.95f, 0.0f, 0.2f, 0.00f, 0.000f * CFDS, 1, 0, 0, 2, 2, 1, 1, 55, SC_POWDERS, R_TEMP+0.0f +273.15f, 70, "Clay dust. Produces paste when mixed with water.", ST_SOLID, TYPE_PART, &update_CLST}, {"WIRE", PIXPACK(0xFFCC00), 0.0f, 0.00f * CFDS, 0.00f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 250, "WireWorld wires.",ST_SOLID,TYPE_SOLID,&update_WIRE}, {"GBMB", PIXPACK(0x1144BB), 0.6f, 0.01f * CFDS, 0.98f, 0.95f, 0.0f, 0.1f, 0.00f, 0.000f * CFDS, 1, 0, 0, 0, 20, 1, 1, 30, SC_EXPLOSIVE, R_TEMP-2.0f +273.15f, 29, "Sticks to first object it touches then produces strong gravity push.", ST_NONE, TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC, &update_GBMB}, + {"FIGH", PIXPACK(0x000000), 0.5f, 0.00f * CFDS, 0.2f, 1.0f, 0.0f, 0.0f, 0.0f, 0.00f * CFDS, 0, 0, 0, 0, 0, 1, 1, 50, SC_SPECIAL, R_TEMP+14.6f+273.15f, 0, "Fighter. Tries to kill stickmans.", ST_NONE, 0, &update_FIGH}, //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Use Weight Section H Ins Description }; @@ -747,6 +750,7 @@ static part_transition ptransitions[PT_NUM] = /* CLST */ {IPL, NT, IPH, NT, ITL, NT, 1256.0f, PT_LAVA}, /* WIRE */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* GBMB */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* FIGH */ {IPL, NT, IPH, NT, ITL, NT, 620.0f, PT_FIRE}, }; #undef IPL #undef IPH @@ -977,6 +981,9 @@ extern int gravwl_timeout; extern float player[29]; extern float player2[29]; +extern float fighters[256][28]; +extern unsigned char fighcount; + extern int gravityMode; extern int airMode; diff --git a/src/elements/figh.c b/src/elements/figh.c new file mode 100644 index 000000000..c67ebf9c0 --- /dev/null +++ b/src/elements/figh.c @@ -0,0 +1,7 @@ +#include + +int update_FIGH(UPDATE_FUNC_ARGS) +{ + run_stickman(fighters[(unsigned char)parts[i].tmp], UPDATE_FUNC_SUBCALL_ARGS); + return 0; +} diff --git a/src/graphics.c b/src/graphics.c index fd6c2b2eb..9e863862e 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1017,25 +1017,103 @@ inline int drawchar(pixel *vid, int x, int y, int c, int r, int g, int b, int a) if (!bn) { ba = *(rp++); - bn = 8; - } - drawpixel(vid, x+i, y+j, r, g, b, ((ba&3)*a)/3); - ba >>= 2; - bn -= 2; + bn = 8; } - return x + w; + drawpixel(vid, x+i, y+j, r, g, b, ((ba&3)*a)/3); + ba >>= 2; + bn -= 2; + } +return x + w; } int drawtext(pixel *vid, int x, int y, const char *s, int r, int g, int b, int a) { #ifdef OpenGL #else - int sx = x; - for (; *s; s++) +int sx = x; +for (; *s; s++) +{ + if (*s == '\n') + { + x = sx; + y += FONT_H+2; + } + else if (*s == '\b') + { + switch (s[1]) + { + case 'w': + r = g = b = 255; + break; + case 'g': + r = g = b = 192; + break; + case 'o': + r = 255; + g = 216; + b = 32; + break; + case 'r': + r = 255; + g = b = 0; + break; + case 'b': + r = g = 0; + b = 255; + break; + case 't': + b = 255; + g = 170; + r = 32; + break; + } + s++; + } + else + x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a); +} +#endif +return x; +} + +//Draw text with an outline +int drawtext_outline(pixel *vid, int x, int y, const char *s, int r, int g, int b, int a, int or, int og, int ob, int oa) +{ +drawtext(vid, x-1, y-1, s, or, og, ob, oa); +drawtext(vid, x+1, y+1, s, or, og, ob, oa); + +drawtext(vid, x-1, y+1, s, or, og, ob, oa); +drawtext(vid, x+1, y-1, s, or, og, ob, oa); + +return drawtext(vid, x, y, s, r, g, b, a); +} +int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, int b, int a) +{ +#ifdef OpenGL +#else +int sx = x; +int rh = 12; +int rw = 0; +int cw = x; +int wordlen; +int charspace; +while (*s) +{ + wordlen = strcspn(s," .,!?\n"); + charspace = textwidthx((char *)s, w-(x-cw)); + if (charspace=-1; s++) { if (*s == '\n') { x = sx; + rw = 0; y += FONT_H+2; } else if (*s == '\b') @@ -1065,56 +1143,13 @@ int drawtext(pixel *vid, int x, int y, const char *s, int r, int g, int b, int a r = g = 0; b = 255; break; - case 't': - b = 255; - g = 170; - r = 32; - break; } s++; } else - x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a); - } -#endif - return x; -} + { -//Draw text with an outline -int drawtext_outline(pixel *vid, int x, int y, const char *s, int r, int g, int b, int a, int or, int og, int ob, int oa) -{ - drawtext(vid, x-1, y-1, s, or, og, ob, oa); - drawtext(vid, x+1, y+1, s, or, og, ob, oa); - - drawtext(vid, x-1, y+1, s, or, og, ob, oa); - drawtext(vid, x+1, y-1, s, or, og, ob, oa); - - return drawtext(vid, x, y, s, r, g, b, a); -} -int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, int b, int a) -{ -#ifdef OpenGL -#else - int sx = x; - int rh = 12; - int rw = 0; - int cw = x; - int wordlen; - int charspace; - while (*s) - { - wordlen = strcspn(s," .,!?\n"); - charspace = textwidthx((char *)s, w-(x-cw)); - if (charspace=-1; s++) - { - if (*s == '\n') + if (x-cw>=w) { x = sx; rw = 0; @@ -1167,36 +1202,38 @@ int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, i } x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a); } + x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a); } } +} - return rh; - #endif +return rh; +#endif } //draws a rectange, (x,y) are the top left coords. void drawrect(pixel *vid, int x, int y, int w, int h, int r, int g, int b, int a) { #ifdef OpenGL - glBegin(GL_LINE_LOOP); - glColor4ub(r, g, b, a); - glVertex2i(x, y); - glVertex2i(x+w, y); - glVertex2i(x+w, y+h); - glVertex2i(x, y+h); - glEnd(); +glBegin(GL_LINE_LOOP); +glColor4ub(r, g, b, a); +glVertex2i(x, y); +glVertex2i(x+w, y); +glVertex2i(x+w, y+h); +glVertex2i(x, y+h); +glEnd(); #else - int i; - for (i=0; i<=w; i++) - { - drawpixel(vid, x+i, y, r, g, b, a); - drawpixel(vid, x+i, y+h, r, g, b, a); - } - for (i=1; i=w && x+textwidth(s)>=w+5) - break; - x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a); - } - if (*s) - for (i=0; i<3; i++) - x = drawchar(vid, x, y, '.', r, g, b, a); - return x; +int i; +w += x-5; +for (; *s; s++) +{ + if (x+font_data[font_ptrs[(int)(*(unsigned char *)s)]]>=w && x+textwidth(s)>=w+5) + break; + x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a); +} +if (*s) + for (i=0; i<3; i++) + x = drawchar(vid, x, y, '.', r, g, b, a); +return x; } int textnwidth(char *s, int n) { - int x = 0; - for (; *s; s++) - { - if (!n) - break; - x += font_data[font_ptrs[(int)(*(unsigned char *)s)]]; - n--; - } - return x-1; +int x = 0; +for (; *s; s++) +{ + if (!n) + break; + x += font_data[font_ptrs[(int)(*(unsigned char *)s)]]; + n--; +} +return x-1; } void textnpos(char *s, int n, int w, int *cx, int *cy) { - int x = 0; - int y = 0; - int wordlen, charspace; - while (*s&&n) +int x = 0; +int y = 0; +int wordlen, charspace; +while (*s&&n) +{ + wordlen = strcspn(s," .,!?\n"); + charspace = textwidthx(s, w-x); + if (charspace=-1; s++) + { + if (!n) { + break; + } + x += font_data[font_ptrs[(int)(*(unsigned char *)s)]]; + if (x>=w) { x = 0; y += FONT_H+2; } - for (; *s && --wordlen>=-1; s++) - { - if (!n) { - break; - } - x += font_data[font_ptrs[(int)(*(unsigned char *)s)]]; - if (x>=w) - { - x = 0; - y += FONT_H+2; - } - n--; - } + n--; } - *cx = x-1; - *cy = y; +} +*cx = x-1; +*cy = y; } int textwidthx(char *s, int w) { - int x=0,n=0,cw; - for (; *s; s++) - { - cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]]; - if (x+(cw/2) >= w) - break; - x += cw; - n++; - } - return n; +int x=0,n=0,cw; +for (; *s; s++) +{ + cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]]; + if (x+(cw/2) >= w) + break; + x += cw; + n++; +} +return n; } int textposxy(char *s, int width, int w, int h) { - int x=0,y=0,n=0,cw, wordlen, charspace; - while (*s) +int x=0,y=0,n=0,cw, wordlen, charspace; +while (*s) +{ + wordlen = strcspn(s," .,!?\n"); + charspace = textwidthx(s, width-x); + if (charspace=-1; s++) + { + cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]]; + if ((x+(cw/2) >= w && y+6 >= h)||(y+6 >= h+FONT_H+2)) + return n++; + x += cw; + if (x>=width) { x = 0; y += FONT_H+2; } - for (; *s && --wordlen>=-1; s++) - { - cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]]; - if ((x+(cw/2) >= w && y+6 >= h)||(y+6 >= h+FONT_H+2)) - return n++; - x += cw; - if (x>=width) { - x = 0; - y += FONT_H+2; - } - n++; - } + n++; } - return n; +} +return n; } int textwrapheight(char *s, int width) { - int x=0, height=FONT_H+2, cw; - int wordlen; - int charspace; - while (*s) +int x=0, height=FONT_H+2, cw; +int wordlen; +int charspace; +while (*s) +{ + wordlen = strcspn(s," .,!?\n"); + charspace = textwidthx(s, width-x); + if (charspace=-1; s++) + { + if (*s == '\n') { x = 0; height += FONT_H+2; } - for (; *s && --wordlen>=-1; s++) + else if (*s == '\b') { - if (*s == '\n') + s++; + } + else + { + cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]]; + if (x+cw>=width) { x = 0; height += FONT_H+2; } - else if (*s == '\b') - { - s++; - } - else - { - cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]]; - if (x+cw>=width) - { - x = 0; - height += FONT_H+2; - } - x += cw; - } + x += cw; } } - return height; +} +return height; } //the most used function for drawing a pixel, because it has OpenGL support, which is not fully implemented. @@ -1424,120 +1461,127 @@ inline void blendpixel(pixel *vid, int x, int y, int r, int g, int b, int a) void draw_icon(pixel *vid_buf, int x, int y, char ch, int flag) { - char t[2]; - t[0] = ch; - t[1] = 0; - if (flag) - { - fillrect(vid_buf, x-1, y-1, 17, 17, 255, 255, 255, 255); - drawtext(vid_buf, x+3, y+2, t, 0, 0, 0, 255); - } - else - { - drawrect(vid_buf, x, y, 15, 15, 255, 255, 255, 255); - drawtext(vid_buf, x+3, y+2, t, 255, 255, 255, 255); - } +char t[2]; +t[0] = ch; +t[1] = 0; +if (flag) +{ + fillrect(vid_buf, x-1, y-1, 17, 17, 255, 255, 255, 255); + drawtext(vid_buf, x+3, y+2, t, 0, 0, 0, 255); +} +else +{ + drawrect(vid_buf, x, y, 15, 15, 255, 255, 255, 255); + drawtext(vid_buf, x+3, y+2, t, 255, 255, 255, 255); +} } void draw_air(pixel *vid) { - int x, y, i, j; - pixel c; +int x, y, i, j; +pixel c; - if (cmode == CM_PERS)//this should never happen anyway - return; +if (cmode == CM_PERS)//this should never happen anyway + return; - for (y=0; y 0.0f) - c = PIXRGB(clamp_flt(pv[y][x], 0.0f, 8.0f), 0, 0);//positive pressure is red! - else - c = PIXRGB(0, 0, clamp_flt(-pv[y][x], 0.0f, 8.0f));//negative pressure is blue! - } - else if (cmode == CM_VEL) - { - c = PIXRGB(clamp_flt(fabsf(vx[y][x]), 0.0f, 8.0f),//vx adds red - clamp_flt(pv[y][x], 0.0f, 8.0f),//pressure adds green - clamp_flt(fabsf(vy[y][x]), 0.0f, 8.0f));//vy adds blue - } - else if (cmode == CM_HEAT && aheat_enable) - { - float ttemp = hv[y][x]+(-MIN_TEMP); - int caddress = restrict_flt((int)( restrict_flt(ttemp, 0.0f, MAX_TEMP+(-MIN_TEMP)) / ((MAX_TEMP+(-MIN_TEMP))/1024) ) *3, 0.0f, (1024.0f*3)-3); - c = PIXRGB((int)((unsigned char)color_data[caddress]*0.7f), (int)((unsigned char)color_data[caddress+1]*0.7f), (int)((unsigned char)color_data[caddress+2]*0.7f)); - //c = PIXRGB(clamp_flt(fabsf(vx[y][x]), 0.0f, 8.0f),//vx adds red - // clamp_flt(hv[y][x], 0.0f, 1600.0f),//heat adds green - // clamp_flt(fabsf(vy[y][x]), 0.0f, 8.0f));//vy adds blue - } - else if (cmode == CM_CRACK) - { - int r; - int g; - int b; - // velocity adds grey - r = clamp_flt(fabsf(vx[y][x]), 0.0f, 24.0f) + clamp_flt(fabsf(vy[y][x]), 0.0f, 20.0f); - g = clamp_flt(fabsf(vx[y][x]), 0.0f, 20.0f) + clamp_flt(fabsf(vy[y][x]), 0.0f, 24.0f); - b = clamp_flt(fabsf(vx[y][x]), 0.0f, 24.0f) + clamp_flt(fabsf(vy[y][x]), 0.0f, 20.0f); - if (pv[y][x] > 0.0f) - { - r += clamp_flt(pv[y][x], 0.0f, 16.0f);//pressure adds red! - if (r>255) - r=255; - if (g>255) - g=255; - if (b>255) - b=255; - c = PIXRGB(r, g, b); - } - else - { - b += clamp_flt(-pv[y][x], 0.0f, 16.0f);//pressure adds blue! - if (r>255) - r=255; - if (g>255) - g=255; - if (b>255) - b=255; - c = PIXRGB(r, g, b); - } - } - for (j=0; j 0.0f) + c = PIXRGB(clamp_flt(pv[y][x], 0.0f, 8.0f), 0, 0);//positive pressure is red! + else + c = PIXRGB(0, 0, clamp_flt(-pv[y][x], 0.0f, 8.0f));//negative pressure is blue! } + else if (cmode == CM_VEL) + { + c = PIXRGB(clamp_flt(fabsf(vx[y][x]), 0.0f, 8.0f),//vx adds red + clamp_flt(pv[y][x], 0.0f, 8.0f),//pressure adds green + clamp_flt(fabsf(vy[y][x]), 0.0f, 8.0f));//vy adds blue + } + else if (cmode == CM_HEAT && aheat_enable) + { + float ttemp = hv[y][x]+(-MIN_TEMP); + int caddress = restrict_flt((int)( restrict_flt(ttemp, 0.0f, MAX_TEMP+(-MIN_TEMP)) / ((MAX_TEMP+(-MIN_TEMP))/1024) ) *3, 0.0f, (1024.0f*3)-3); + c = PIXRGB((int)((unsigned char)color_data[caddress]*0.7f), (int)((unsigned char)color_data[caddress+1]*0.7f), (int)((unsigned char)color_data[caddress+2]*0.7f)); + //c = PIXRGB(clamp_flt(fabsf(vx[y][x]), 0.0f, 8.0f),//vx adds red + // clamp_flt(hv[y][x], 0.0f, 1600.0f),//heat adds green + // clamp_flt(fabsf(vy[y][x]), 0.0f, 8.0f));//vy adds blue + } + else if (cmode == CM_CRACK) + { + int r; + int g; + int b; + // velocity adds grey + r = clamp_flt(fabsf(vx[y][x]), 0.0f, 24.0f) + clamp_flt(fabsf(vy[y][x]), 0.0f, 20.0f); + g = clamp_flt(fabsf(vx[y][x]), 0.0f, 20.0f) + clamp_flt(fabsf(vy[y][x]), 0.0f, 24.0f); + b = clamp_flt(fabsf(vx[y][x]), 0.0f, 24.0f) + clamp_flt(fabsf(vy[y][x]), 0.0f, 20.0f); + if (pv[y][x] > 0.0f) + { + r += clamp_flt(pv[y][x], 0.0f, 16.0f);//pressure adds red! + if (r>255) + r=255; + if (g>255) + g=255; + if (b>255) + b=255; + c = PIXRGB(r, g, b); + } + else + { + b += clamp_flt(-pv[y][x], 0.0f, 16.0f);//pressure adds blue! + if (r>255) + r=255; + if (g>255) + g=255; + if (b>255) + b=255; + c = PIXRGB(r, g, b); + } + } + for (j=0; jdx) +if (dy>dx) +{ + dx = dx+dy; + dy = dx-dy; + dx = dx-dy; + check = 1; +} + +e = (dy<<2)-dx; +for (i=0; i<=dx; i++) +{ + if (x>=0 && y>=0 && x=0) { - dx = dx+dy; - dy = dx-dy; - dx = dx-dy; - check = 1; - } - - e = (dy<<2)-dx; - for (i=0; i<=dx; i++) - { - if (x>=0 && y>=0 && x=0) - { - if (check==1) - x = x+sx; - else - y = y+sy; - e = e-(dx<<2); - } if (check==1) - y = y+sy; - else x = x+sx; - e = e+(dy<<2); + else + y = y+sy; + e = e-(dx<<2); } + if (check==1) + y = y+sy; + else + x = x+sx; + e = e+(dy<<2); +} } //adds color to a pixel, does not overwrite. void addpixel(pixel *vid, int x, int y, int r, int g, int b, int a) { - pixel t; - if (x<0 || y<0 || x>=XRES || y>=YRES) - return; - t = vid[y*(XRES+BARSIZE)+x]; - r = (a*r + 255*PIXR(t)) >> 8; - g = (a*g + 255*PIXG(t)) >> 8; - b = (a*b + 255*PIXB(t)) >> 8; - if (r>255) - r = 255; - if (g>255) - g = 255; - if (b>255) - b = 255; - vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b); +pixel t; +if (x<0 || y<0 || x>=XRES || y>=YRES) + return; +t = vid[y*(XRES+BARSIZE)+x]; +r = (a*r + 255*PIXR(t)) >> 8; +g = (a*g + 255*PIXG(t)) >> 8; +b = (a*b + 255*PIXB(t)) >> 8; +if (r>255) + r = 255; +if (g>255) + g = 255; +if (b>255) + b = 255; +vid[y*(XRES+BARSIZE)+x] = PIXRGB(r,g,b); } //draws one of two colors, so that it is always clearly visible void xor_pixel(int x, int y, pixel *vid) { - int c; - if (x<0 || y<0 || x>=XRES || y>=YRES) - return; - c = vid[y*(XRES+BARSIZE)+x]; - c = PIXB(c) + 3*PIXG(c) + 2*PIXR(c); - if (c<512) - vid[y*(XRES+BARSIZE)+x] = PIXPACK(0xC0C0C0); - else - vid[y*(XRES+BARSIZE)+x] = PIXPACK(0x404040); +int c; +if (x<0 || y<0 || x>=XRES || y>=YRES) + return; +c = vid[y*(XRES+BARSIZE)+x]; +c = PIXB(c) + 3*PIXG(c) + 2*PIXR(c); +if (c<512) + vid[y*(XRES+BARSIZE)+x] = PIXPACK(0xC0C0C0); +else + vid[y*(XRES+BARSIZE)+x] = PIXPACK(0x404040); } //same as xor_pixel, but draws a line of it void xor_line(int x1, int y1, int x2, int y2, pixel *vid) { - int cp=abs(y2-y1)>abs(x2-x1), x, y, dx, dy, sy; - float e, de; - if (cp) - { - y = x1; - x1 = y1; - y1 = y; - y = x2; - x2 = y2; - y2 = y; - } - if (x1 > x2) - { - y = x1; - x1 = x2; - x2 = y; - y = y1; - y1 = y2; - y2 = y; - } - dx = x2 - x1; - dy = abs(y2 - y1); - e = 0.0f; - if (dx) - de = dy/(float)dx; - else - de = 0.0f; +int cp=abs(y2-y1)>abs(x2-x1), x, y, dx, dy, sy; +float e, de; +if (cp) +{ + y = x1; + x1 = y1; + y1 = y; + y = x2; + x2 = y2; + y2 = y; +} +if (x1 > x2) +{ + y = x1; + x1 = x2; + x2 = y; y = y1; - sy = (y1= 0.5f) { - if (cp) - xor_pixel(y, x, vid); - else - xor_pixel(x, y, vid); - e += de; - if (e >= 0.5f) - { - y += sy; - e -= 1.0f; - } + y += sy; + e -= 1.0f; } } +} //same as blend_pixel, but draws a line of it void blend_line(pixel *vid, int x1, int y1, int x2, int y2, int r, int g, int b, int a) { - int cp=abs(y2-y1)>abs(x2-x1), x, y, dx, dy, sy; - float e, de; - if (cp) - { - y = x1; - x1 = y1; - y1 = y; - y = x2; - x2 = y2; - y2 = y; - } - if (x1 > x2) - { - y = x1; - x1 = x2; - x2 = y; - y = y1; - y1 = y2; - y2 = y; - } - dx = x2 - x1; - dy = abs(y2 - y1); - e = 0.0f; - if (dx) - de = dy/(float)dx; - else - de = 0.0f; +int cp=abs(y2-y1)>abs(x2-x1), x, y, dx, dy, sy; +float e, de; +if (cp) +{ + y = x1; + x1 = y1; + y1 = y; + y = x2; + x2 = y2; + y2 = y; +} +if (x1 > x2) +{ + y = x1; + x1 = x2; + x2 = y; y = y1; - sy = (y1= 0.5f) { - if (cp) - blendpixel(vid, y, x, r, g, b, a); - else - blendpixel(vid, x, y, r, g, b, a); - e += de; - if (e >= 0.5f) - { - y += sy; - e -= 1.0f; - } + y += sy; + e -= 1.0f; } } +} //same as xor_pixel, but draws a rectangle void xor_rect(pixel *vid, int x, int y, int w, int h) { - int i; - for (i=0; i(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head { - char buff[20]; //Buffer for HP - pixel pc; - - if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head - { - sprintf(buff, "%3d", parts[i].life); //Show HP - drawtext(vid, mousex-8-2*(parts[i].life<100)-2*(parts[i].life<10), mousey-12, buff, 255, 255, 255, 255); - } - - if ((int)player[2](nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head { - char buff[20]; //Buffer for HP - pixel pc; - - if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head - { - sprintf(buff, "%3d", parts[i].life); //Show HP - drawtext(vid, mousex-8-2*(parts[i].life<100)-2*(parts[i].life<10), mousey-12, buff, 255, 255, 255, 255); - } - - if ((int)player2[2](nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head + { + sprintf(buff, "%3d", parts[i].life); //Show HP + drawtext(vid, mousex-8-2*(parts[i].life<100)-2*(parts[i].life<10), mousey-12, buff, 255, 255, 255, 255); + } + if ((int)figh[2](nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head + { + sprintf(buff, "%3d", parts[i].life); //Show HP + drawtext(vid, mousex-8-2*(parts[i].life<100)-2*(parts[i].life<10), mousey-12, buff, 255, 255, 255, 255); + } + + s = XRES+BARSIZE; + //head + draw_line(vid , nx, ny+2, nx+2, ny, R, G, B, s); + draw_line(vid , nx+2, ny, nx, ny-2, R, G, B, s); + draw_line(vid , nx, ny-2, nx-2, ny, R, G, B, s); + draw_line(vid , nx-2, ny, nx, ny+2, R, G, B, s); + //legs + draw_line(vid , nx, ny+3, figh[3], figh[4], R, G, B, s); + draw_line(vid , figh[3], figh[4], figh[7], figh[8], R, G, B, s); + draw_line(vid , nx, ny+3, figh[11], figh[12], R, G, B, s); + draw_line(vid , figh[11], figh[12], figh[15], figh[16], R, G, B, s); + } else { vid[ny*(XRES+BARSIZE)+nx] = PIXRGB(R, G, B); @@ -4706,10 +4809,10 @@ pixel *prerender_save(void *save, int size, int *width, int *height) j=d[p++]; if (j0) { - if (j==PT_STKM || j==PT_STKM2) + if (j==PT_STKM || j==PT_STKM2 || j==PT_FIGH) { pixel lc, hc=PIXRGB(255, 224, 178); - if (j==PT_STKM) lc = PIXRGB(255, 255, 255); + if (j==PT_STKM || j==PT_FIGH) lc = PIXRGB(255, 255, 255); else lc = PIXRGB(100, 100, 255); //only need to check upper bound of y coord - lower bounds and x>8].ctype = t; @@ -836,7 +862,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a parts[i].pavg[0] = 0.0f; parts[i].pavg[1] = 0.0f; } - if (t!=PT_STKM&&t!=PT_STKM2)//set everything to default values first, except for stickman. + if (t!=PT_STKM&&t!=PT_STKM2&&t!=PT_FIGH)//set everything to default values first, except for stickman. { parts[i].x = (float)x; parts[i].y = (float)y; @@ -1003,12 +1029,36 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a create_part(-1,x,y,PT_SPAWN2); ISSPAWN2 = 1; } + if (t==PT_FIGH) + { + unsigned char cunt = 0; + while (cunt < 100 && cunt < (fighcount+1) && fighters[cunt][27]==1) cunt++; + if (cunt < 100 && fighters[cunt][27]==0) + { + parts[i].x = (float)x; + parts[i].y = (float)y; + parts[i].type = PT_FIGH; + parts[i].vx = 0; + parts[i].vy = 0; + parts[i].life = 100; + parts[i].ctype = 0; + parts[i].tmp = cunt; + parts[i].temp = ptypes[t].heat; + STKM_init_legs(fighters[cunt], i); + fighters[cunt][27] = 1; + fighters[cunt][2] = PT_DUST; + fighcount++; + + return i; + } + return -1; + } if (t==PT_BIZR||t==PT_BIZRG) parts[i].ctype = 0x47FFFF; //and finally set the pmap/photon maps to the newly created particle if (t==PT_PHOT||t==PT_NEUT) photons[y][x] = t|(i<<8); - if (t!=PT_STKM&&t!=PT_STKM2 && t!=PT_PHOT && t!=PT_NEUT) + if (t!=PT_STKM&&t!=PT_STKM2 && t!=PT_FIGH && t!=PT_PHOT && t!=PT_NEUT) pmap[y][x] = t|(i<<8); //Fancy dust effects for powder types @@ -1674,7 +1724,7 @@ void update_particles_i(pixel *vid, int start, int inc) (bmap[y/CELL][x/CELL]==WL_ALLOWGAS && !(ptypes[t].properties&TYPE_GAS)) || //&& ptypes[t].falldown!=0 && parts[i].type!=PT_FIRE && parts[i].type!=PT_SMKE && parts[i].type!=PT_HFLM) || (bmap[y/CELL][x/CELL]==WL_ALLOWENERGY && !(ptypes[t].properties&TYPE_ENERGY)) || (bmap[y/CELL][x/CELL]==WL_DETECT && (t==PT_METL || t==PT_SPRK)) || - (bmap[y/CELL][x/CELL]==WL_EWALL && !emap[y/CELL][x/CELL])) && (t!=PT_STKM) && (t!=PT_STKM2))) + (bmap[y/CELL][x/CELL]==WL_EWALL && !emap[y/CELL][x/CELL])) && (t!=PT_STKM) && (t!=PT_STKM2) && (t!=PT_FIGH))) { kill_part(i); continue; @@ -1736,7 +1786,7 @@ void update_particles_i(pixel *vid, int start, int inc) pGravX -= gravxf[(y*XRES)+x]; pGravY -= gravyf[(y*XRES)+x]; } - else if(t!=PT_STKM && t!=PT_STKM2 && !(ptypes[t].properties & TYPE_SOLID)) + else if(t!=PT_STKM && t!=PT_STKM2 && t!=PT_FIGH && !(ptypes[t].properties & TYPE_SOLID)) { pGravX += gravxf[(y*XRES)+x]; pGravY += gravyf[(y*XRES)+x]; @@ -2838,7 +2888,7 @@ int create_parts(int x, int y, int rx, int ry, int c, int flags) int i, j, r, f = 0, u, v, oy, ox, b = 0, dw = 0, stemp = 0, p;//n; int wall = c - 100; - if (c==SPC_WIND){ + if (c==SPC_WIND || c==PT_FIGH) return 0; } if(c==SPC_PROP){