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

Merge latest FIGH additions

Browse Source
This commit is contained in:
Simon Robertshaw 2011-10-26 17:10:21 +01:00
commit e2c9882692
10 changed files with 457 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
includes/powder.h
View File

@ -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
@ -309,11 +310,24 @@ int graphics_STKM2(GRAPHICS_FUNC_ARGS);
int graphics_DEST(GRAPHICS_FUNC_ARGS);
int graphics_EMP(GRAPHICS_FUNC_ARGS);
int graphics_LIGH(GRAPHICS_FUNC_ARGS);
int graphics_FIGH(GRAPHICS_FUNC_ARGS);
#define UPDATE_FUNC_ARGS int i, int x, int y, int surround_space, int nt
// to call another update function with same arguments:
#define UPDATE_FUNC_SUBCALL_ARGS i, x, y, surround_space, nt
struct playerst
{
char comm; //command cell
char pcomm; //previous command
int elem; //element power
float legs[16]; //legs' positions
float accs[8]; //accelerations
char spwn; //if stick man was spawned
unsigned int frames; //frames since last particle spawn - used when spawning LIGH
};
typedef struct playerst playerst;
int update_ACID(UPDATE_FUNC_ARGS);
int update_ANAR(UPDATE_FUNC_ARGS);
int update_AMTR(UPDATE_FUNC_ARGS);
@ -402,13 +416,14 @@ int update_CAUS(UPDATE_FUNC_ARGS);
int update_DEST(UPDATE_FUNC_ARGS);
int update_EMP(UPDATE_FUNC_ARGS);
int update_LIGH(UPDATE_FUNC_ARGS);
int update_FIGH(UPDATE_FUNC_ARGS);
int update_MISC(UPDATE_FUNC_ARGS);
int update_legacy_PYRO(UPDATE_FUNC_ARGS);
int update_legacy_all(UPDATE_FUNC_ARGS);
int run_stickman(float* playerp, UPDATE_FUNC_ARGS);
void STKM_init_legs(float* playerp, int i);
void STKM_interact(float* playerp, int i, int x, int y);
int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS);
void STKM_init_legs(playerst* playerp, int i);
void STKM_interact(playerst* playerp, int i, int x, int y);
struct part_type
{
@ -625,6 +640,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, &graphics_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, NULL},
{"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, &graphics_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, &graphics_FIGH},
//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Use Weight Section H Ins Description
};
@ -798,6 +814,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
@ -1025,8 +1042,11 @@ extern int wire_placed;
extern int gravwl_timeout;
extern float player[29];
extern float player2[29];
extern playerst player;
extern playerst player2;
extern playerst fighters[256];
extern unsigned char fighcount;
extern int gravityMode;
extern int airMode;

91
src/elements/figh.c Normal file
View File

@ -0,0 +1,91 @@
#include <element.h>
int update_FIGH(UPDATE_FUNC_ARGS)
{
playerst* figh = &fighters[(unsigned char)parts[i].tmp];
float tarx, tary;
parts[i].tmp2 = 0; //0 - stay in place, 1 - seek a stick man
//Set target cords
if (player.spwn)
{
if (player2.spwn)
if ((pow(player.legs[2]-x, 2) + pow(player.legs[3]-y, 2))<=
(pow(player2.legs[2]-x, 2) + pow(player2.legs[3]-y, 2)))
{
tarx = player.legs[2];
tary = player.legs[3];
}
else
{
tarx = player2.legs[2];
tary = player2.legs[3];
}
else
{
tarx = player.legs[2];
tary = player.legs[3];
}
parts[i].tmp2 = 1;
}
else
if (player2.spwn)
{
tarx = player2.legs[2];
tary = player2.legs[3];
parts[i].tmp2 = 1;
}
switch (parts[i].tmp2)
{
case 1:
if ((pow(tarx-x, 2) + pow(tary-y, 2))<600)
{
if (figh->elem == PT_FIRE || figh->elem == PT_LIGH)
figh->comm = (int)figh->comm | 0x08;
}
else
if (tarx<x)
{
figh->comm = 0x01;
if (!eval_move(PT_DUST, figh->legs[4]-4, figh->legs[5]-1, NULL) || !eval_move(PT_DUST, figh->legs[12]-4, figh->legs[13]-1, NULL))
figh->comm = (int)figh->comm | 0x04;
}
else
{
figh->comm = 0x02;
if (!eval_move(PT_DUST, figh->legs[4]+4, figh->legs[5]-1, NULL) || !eval_move(PT_DUST, figh->legs[12]+4, figh->legs[13]-1, NULL))
figh->comm = (int)figh->comm | 0x04;
}
break;
default:
figh->comm = 0;
break;
}
figh->pcomm = figh->comm;
run_stickman(figh, UPDATE_FUNC_SUBCALL_ARGS);
return 0;
}
int graphics_FIGH(GRAPHICS_FUNC_ARGS)
{
playerst * cplayer = &fighters[(unsigned char)cpart->tmp];
*pixel_mode = PSPEC_STICKMAN;
if (cplayer->elem<PT_NUM)
{
*colr = PIXR(ptypes[cplayer->elem].pcolors);
*colg = PIXG(ptypes[cplayer->elem].pcolors);
*colb = PIXB(ptypes[cplayer->elem].pcolors);
}
else
{
*colr = *colg = *colb = 255;
}
return 1;
}

2
src/elements/ligh.c
View File

@ -165,7 +165,7 @@ int update_LIGH(UPDATE_FUNC_ARGS)
}
if (ptypes[r&0xFF].hconduct)
parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful/10, MIN_TEMP, MAX_TEMP);
if (((r&0xFF)==PT_STKM && player[2]!=PT_LIGH) || ((r&0xFF)==PT_STKM2 && player2[2]!=PT_LIGH))
if (((r&0xFF)==PT_STKM && player.elem!=PT_LIGH) || ((r&0xFF)==PT_STKM2 && player2.elem!=PT_LIGH))
{
parts[r>>8].life-=powderful/100;
}

4
src/elements/prto.c
View File

@ -44,9 +44,9 @@ int update_PRTO(UPDATE_FUNC_ARGS) {
else if (portalp[parts[i].tmp][randomness][nnx].type)
{
if (portalp[parts[i].tmp][randomness][nnx].type==PT_STKM)
player[27] = 0;
player.spwn = 0;
if (portalp[parts[i].tmp][randomness][nnx].type==PT_STKM2)
player2[27] = 0;
player2.spwn = 0;
np = create_part(-1,x+rx,y+ry,portalp[parts[i].tmp][randomness][nnx].type);
if (np<0) continue;
parts[np] = portalp[parts[i].tmp][randomness][nnx];

340
src/elements/stkm.c
View File

@ -1,7 +1,7 @@
#include <element.h>
int update_SPAWN(UPDATE_FUNC_ARGS) {
if (!player[27])
if (!player.spwn)
create_part(-1, x, y, PT_STKM);
return 0;
@ -9,18 +9,18 @@ int update_SPAWN(UPDATE_FUNC_ARGS) {
int update_STKM(UPDATE_FUNC_ARGS)
{
run_stickman(player, UPDATE_FUNC_SUBCALL_ARGS);
run_stickman(&player, UPDATE_FUNC_SUBCALL_ARGS);
return 0;
}
int graphics_STKM(GRAPHICS_FUNC_ARGS)
{
*pixel_mode = PSPEC_STICKMAN;
if ((int)player[2]<PT_NUM)
if ((int)player.elem<PT_NUM)
{
*colr = PIXR(ptypes[(int)player[2]].pcolors);
*colg = PIXG(ptypes[(int)player[2]].pcolors);
*colb = PIXB(ptypes[(int)player[2]].pcolors);
*colr = PIXR(ptypes[player.elem].pcolors);
*colg = PIXG(ptypes[player.elem].pcolors);
*colb = PIXB(ptypes[player.elem].pcolors);
}
else
{
@ -29,7 +29,7 @@ int graphics_STKM(GRAPHICS_FUNC_ARGS)
return 1;
}
int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
int r, rx, ry;
float pp, d;
float dt = 0.9;///(FPSB*FPSB); //Delta time in square
@ -37,8 +37,8 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
float gx, gy, dl, dr;
if ((parts[i].ctype>0 && parts[i].ctype<PT_NUM && ptypes[parts[i].ctype].falldown>0) || parts[i].ctype==SPC_AIR || parts[i].ctype == PT_NEUT || parts[i].ctype == PT_PHOT || parts[i].ctype == PT_LIGH)
playerp[2] = parts[i].ctype;
playerp[28]++;
playerp->elem = parts[i].ctype;
playerp->frames++;
//Tempirature handling
if (parts[i].temp<243)
@ -47,14 +47,14 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
parts[i].temp += 1;
//Death
if (parts[i].life<1 || (pv[y/CELL][x/CELL]>=4.5f && playerp[2] != SPC_AIR) ) //If his HP is less that 0 or there is very big wind...
if (parts[i].life<1 || (pv[y/CELL][x/CELL]>=4.5f && playerp->elem != SPC_AIR) ) //If his HP is less that 0 or there is very big wind...
{
for (r=-2; r<=1; r++)
{
create_part(-1, x+r, y-2, playerp[2]);
create_part(-1, x+r+1, y+2, playerp[2]);
create_part(-1, x-2, y+r+1, playerp[2]);
create_part(-1, x+2, y+r, playerp[2]);
create_part(-1, x+r, y-2, playerp->elem);
create_part(-1, x+r+1, y+2, playerp->elem);
create_part(-1, x-2, y+r+1, playerp->elem);
create_part(-1, x+2, y+r, playerp->elem);
}
kill_part(i); //Kill him
return 1;
@ -87,116 +87,116 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
parts[i].vy -= gvy*dt;
//Verlet integration
pp = 2*playerp[3]-playerp[5]+playerp[19]*dt*dt;
playerp[5] = playerp[3];
playerp[3] = pp;
pp = 2*playerp[4]-playerp[6]+playerp[20]*dt*dt;
playerp[6] = playerp[4];
playerp[4] = pp;
pp = 2*playerp->legs[0]-playerp->legs[2]+playerp->accs[0]*dt*dt;
playerp->legs[2] = playerp->legs[0];
playerp->legs[0] = pp;
pp = 2*playerp->legs[1]-playerp->legs[3]+playerp->accs[1]*dt*dt;
playerp->legs[3] = playerp->legs[1];
playerp->legs[1] = pp;
pp = 2*playerp[7]-playerp[9]+(playerp[21]+gvx)*dt*dt;
playerp[9] = playerp[7];
playerp[7] = pp;
pp = 2*playerp[8]-playerp[10]+(playerp[22]+gvy)*dt*dt;
playerp[10] = playerp[8];
playerp[8] = pp;
pp = 2*playerp->legs[4]-playerp->legs[6]+(playerp->accs[2]+gvx)*dt*dt;
playerp->legs[6] = playerp->legs[4];
playerp->legs[4] = pp;
pp = 2*playerp->legs[5]-playerp->legs[7]+(playerp->accs[3]+gvy)*dt*dt;
playerp->legs[7] = playerp->legs[5];
playerp->legs[5] = pp;
pp = 2*playerp[11]-playerp[13]+playerp[23]*dt*dt;
playerp[13] = playerp[11];
playerp[11] = pp;
pp = 2*playerp[12]-playerp[14]+playerp[24]*dt*dt;
playerp[14] = playerp[12];
playerp[12] = pp;
pp = 2*playerp->legs[8]-playerp->legs[10]+playerp->accs[4]*dt*dt;
playerp->legs[10] = playerp->legs[8];
playerp->legs[8] = pp;
pp = 2*playerp->legs[9]-playerp->legs[11]+playerp->accs[5]*dt*dt;
playerp->legs[11] = playerp->legs[9];
playerp->legs[9] = pp;
pp = 2*playerp[15]-playerp[17]+(playerp[25]+gvx)*dt*dt;
playerp[17] = playerp[15];
playerp[15] = pp;
pp = 2*playerp[16]-playerp[18]+(playerp[26]+gvy)*dt*dt;
playerp[18] = playerp[16];
playerp[16] = pp;
pp = 2*playerp->legs[12]-playerp->legs[14]+(playerp->accs[6]+gvx)*dt*dt;
playerp->legs[14] = playerp->legs[12];
playerp->legs[12] = pp;
pp = 2*playerp->legs[13]-playerp->legs[15]+(playerp->accs[7]+gvy)*dt*dt;
playerp->legs[15] = playerp->legs[13];
playerp->legs[13] = pp;
//Setting acceleration to 0
playerp[19] = 0;
playerp[20] = 0;
//Setting accseleration to 0
playerp->accs[0] = 0;
playerp->accs[1] = 0;
playerp[21] = 0;
playerp[22] = 0;
playerp->accs[2] = 0;
playerp->accs[3] = 0;
playerp[23] = 0;
playerp[24] = 0;
playerp->accs[4] = 0;
playerp->accs[5] = 0;
playerp[25] = 0;
playerp[26] = 0;
playerp->accs[6] = 0;
playerp->accs[7] = 0;
gx = (playerp[7] + playerp[15])/2 - gvy;
gy = (playerp[8] + playerp[16])/2 + gvx;
dl = pow(gx - playerp[7], 2) + pow(gy - playerp[8], 2);
dr = pow(gx - playerp[15], 2) + pow(gy - playerp[16], 2);
gx = (playerp->legs[4] + playerp->legs[12])/2 - gvy;
gy = (playerp->legs[5] + playerp->legs[13])/2 + gvx;
dl = pow(gx - playerp->legs[4], 2) + pow(gy - playerp->legs[5], 2);
dr = pow(gx - playerp->legs[12], 2) + pow(gy - playerp->legs[13], 2);
//Go left
if (((int)(playerp[0])&0x01) == 0x01)
if (((int)(playerp->comm)&0x01) == 0x01)
{
if (dl>dr)
{
if (!eval_move(PT_DUST, playerp[7], playerp[8], NULL))
if (!eval_move(PT_DUST, playerp->legs[4], playerp->legs[5], NULL))
{
playerp[21] = -3*gvy-3*gvx;
playerp[22] = 3*gvx-3*gvy;
playerp[19] = -gvy;
playerp[20] = gvx;
playerp->accs[2] = -3*gvy-3*gvx;
playerp->accs[3] = 3*gvx-3*gvy;
playerp->accs[0] = -gvy;
playerp->accs[1] = gvx;
}
}
else
{
if (!eval_move(PT_DUST, playerp[15], playerp[16], NULL))
if (!eval_move(PT_DUST, playerp->legs[12], playerp->legs[13], NULL))
{
playerp[25] = -3*gvy-3*gvx;
playerp[26] = 3*gvx-3*gvy;
playerp[19] = -gvy;
playerp[20] = gvx;
playerp->accs[6] = -3*gvy-3*gvx;
playerp->accs[7] = 3*gvx-3*gvy;
playerp->accs[0] = -gvy;
playerp->accs[1] = gvx;
}
}
}
//Go right
if (((int)(playerp[0])&0x02) == 0x02)
if (((int)(playerp->comm)&0x02) == 0x02)
{
if (dl<dr)
{
if (!eval_move(PT_DUST, playerp[7], playerp[8], NULL))
if (!eval_move(PT_DUST, playerp->legs[4], playerp->legs[5], NULL))
{
playerp[21] = 3*gvy-3*gvx;
playerp[22] = -3*gvx-3*gvy;
playerp[19] = gvy;
playerp[20] = -gvx;
playerp->accs[2] = 3*gvy-3*gvx;
playerp->accs[3] = -3*gvx-3*gvy;
playerp->accs[0] = gvy;
playerp->accs[1] = -gvx;
}
}
else
{
if (!eval_move(PT_DUST, playerp[15], playerp[16], NULL))
if (!eval_move(PT_DUST, playerp->legs[12], playerp->legs[13], NULL))
{
playerp[25] = 3*gvy-3*gvx;
playerp[26] = -3*gvx-3*gvy;
playerp[19] = gvy;
playerp[20] = -gvx;
playerp->accs[6] = 3*gvy-3*gvx;
playerp->accs[7] = -3*gvx-3*gvy;
playerp->accs[0] = gvy;
playerp->accs[1] = -gvx;
}
}
}
//Jump
if (((int)(playerp[0])&0x04) == 0x04 &&
(!eval_move(PT_DUST, playerp[7], playerp[8], NULL) || !eval_move(PT_DUST, playerp[15], playerp[16], NULL)))
if (((int)(playerp->comm)&0x04) == 0x04 &&
(!eval_move(PT_DUST, playerp->legs[4], playerp->legs[5], NULL) || !eval_move(PT_DUST, playerp->legs[12], playerp->legs[13], NULL)))
{
parts[i].vy -= 4*gvy;
playerp[22] -= gvy;
playerp[26] -= gvy;
playerp->accs[3] -= gvy;
playerp->accs[7] -= gvy;
}
//Charge detector wall if foot inside
if (bmap[(int)(playerp[8]+0.5)/CELL][(int)(playerp[7]+0.5)/CELL]==WL_DETECT)
set_emap((int)playerp[7]/CELL, (int)playerp[8]/CELL);
if (bmap[(int)(playerp[16]+0.5)/CELL][(int)(playerp[15]+0.5)/CELL]==WL_DETECT)
set_emap((int)(playerp[15]+0.5)/CELL, (int)(playerp[16]+0.5)/CELL);
if (bmap[(int)(playerp->legs[5]+0.5)/CELL][(int)(playerp->legs[4]+0.5)/CELL]==WL_DETECT)
set_emap((int)playerp->legs[4]/CELL, (int)playerp->legs[5]/CELL);
if (bmap[(int)(playerp->legs[13]+0.5)/CELL][(int)(playerp->legs[12]+0.5)/CELL]==WL_DETECT)
set_emap((int)(playerp->legs[12]+0.5)/CELL, (int)(playerp->legs[13]+0.5)/CELL);
//Searching for particles near head
for (rx=-2; rx<3; rx++)
@ -212,10 +212,10 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
if (ptypes[r&0xFF].falldown!=0 || (r&0xFF) == PT_NEUT || (r&0xFF) == PT_PHOT)
{
playerp[2] = r&0xFF; //Current element
playerp->elem = r&0xFF; //Current element
}
if ((r&0xFF)==PT_TESC || (r&0xFF)==PT_LIGH)
playerp[2] = PT_LIGH;
playerp->elem = PT_LIGH;
if ((r&0xFF) == PT_PLNT && parts[i].life<100) //Plant gives him 5 HP
{
if (parts[i].life<=95)
@ -232,7 +232,7 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
kill_part(r>>8);
}
if (bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN)
playerp[2] = SPC_AIR;
playerp->elem = SPC_AIR;
if ((r&0xFF)==PT_PRTI)
STKM_interact(playerp, i, rx, ry);
if (!parts[i].type)//STKM_interact may kill STKM
@ -240,31 +240,31 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
}
//Head position
rx = x + 3*((((int)playerp[1])&0x02) == 0x02) - 3*((((int)playerp[1])&0x01) == 0x01);
ry = y - 3*(playerp[1] == 0);
rx = x + 3*((((int)playerp->pcomm)&0x02) == 0x02) - 3*((((int)playerp->pcomm)&0x01) == 0x01);
ry = y - 3*(playerp->pcomm == 0);
//Spawn
if (((int)(playerp[0])&0x08) == 0x08)
if (((int)(playerp->comm)&0x08) == 0x08)
{
ry -= 2*(rand()%2)+1;
r = pmap[ry][rx];
if (ptypes[r&0xFF].state == ST_SOLID)
{
create_part(-1, rx, ry, PT_SPRK);
playerp[28] = 0;
playerp->frames = 0;
}
else
{
int np = -1;
if (playerp[2] == SPC_AIR)
create_parts(rx + 3*((((int)playerp[1])&0x02) == 0x02) - 3*((((int)playerp[1])&0x01) == 0x01), ry, 4, 4, SPC_AIR, 0);
else if (playerp[2]==PT_LIGH && playerp[28]<30)//limit lightning creation rate
if (playerp->elem == SPC_AIR)
create_parts(rx + 3*((((int)playerp->pcomm)&0x02) == 0x02) - 3*((((int)playerp->pcomm)&0x01) == 0x01), ry, 4, 4, SPC_AIR, 0);
else if (playerp->elem==PT_LIGH && playerp->frames<30)//limit lightning creation rate
np = -1;
else
np = create_part(-1, rx, ry, playerp[2]);
np = create_part(-1, rx, ry, playerp->elem);
if ( (np < NPART) && np>=0)
{
if (playerp[2] == PT_PHOT)
if (playerp->elem == PT_PHOT)
{
int random = abs(rand()%3-1)*3;
if (random==0)
@ -274,13 +274,13 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
else
{
parts[np].vy = 0;
if (((int)playerp[1])&(0x01|0x02))
parts[np].vx = (((((int)playerp[1])&0x02) == 0x02) - (((int)(playerp[1])&0x01) == 0x01))*random;
if (((int)playerp->pcomm)&(0x01|0x02))
parts[np].vx = (((((int)playerp->pcomm)&0x02) == 0x02) - (((int)(playerp->pcomm)&0x01) == 0x01))*random;
else
parts[np].vx = random;
}
}
else if (playerp[2] == PT_LIGH)
else if (playerp->elem == PT_LIGH)
{
float angle;
int power = 100;
@ -288,7 +288,7 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
angle = atan2(gvx, gvy)*180.0f/M_PI;
else
angle = rand()%360;
if (((int)playerp[1])&0x01)
if (((int)playerp->comm)&0x01)
angle += 180;
if (angle>360)
angle-=360;
@ -299,72 +299,72 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
parts[np].temp=parts[np].life*power/2.5;
parts[np].tmp2=1;
}
else if (playerp[2] != SPC_AIR)
else if (playerp->elem != SPC_AIR)
{
parts[np].vx -= -gvy*(5*((((int)playerp[1])&0x02) == 0x02) - 5*(((int)(playerp[1])&0x01) == 0x01));
parts[np].vy -= gvx*(5*((((int)playerp[1])&0x02) == 0x02) - 5*(((int)(playerp[1])&0x01) == 0x01));
parts[i].vx -= (ptypes[(int)playerp[2]].weight*parts[np].vx)/1000;
parts[np].vx -= -gvy*(5*((((int)playerp->pcomm)&0x02) == 0x02) - 5*(((int)(playerp->pcomm)&0x01) == 0x01));
parts[np].vy -= gvx*(5*((((int)playerp->pcomm)&0x02) == 0x02) - 5*(((int)(playerp->pcomm)&0x01) == 0x01));
parts[i].vx -= (ptypes[(int)playerp->elem].weight*parts[np].vx)/1000;
}
playerp[28] = 0;
playerp->frames = 0;
}
}
}
//Simulation of joints
d = 25/(pow((playerp[3]-playerp[7]), 2) + pow((playerp[4]-playerp[8]), 2)+25) - 0.5; //Fast distance
playerp[7] -= (playerp[3]-playerp[7])*d;
playerp[8] -= (playerp[4]-playerp[8])*d;
playerp[3] += (playerp[3]-playerp[7])*d;
playerp[4] += (playerp[4]-playerp[8])*d;
d = 25/(pow((playerp->legs[0]-playerp->legs[4]), 2) + pow((playerp->legs[1]-playerp->legs[5]), 2)+25) - 0.5; //Fast distance
playerp->legs[4] -= (playerp->legs[0]-playerp->legs[4])*d;
playerp->legs[5] -= (playerp->legs[1]-playerp->legs[5])*d;
playerp->legs[0] += (playerp->legs[0]-playerp->legs[4])*d;
playerp->legs[1] += (playerp->legs[1]-playerp->legs[5])*d;
d = 25/(pow((playerp[11]-playerp[15]), 2) + pow((playerp[12]-playerp[16]), 2)+25) - 0.5;
playerp[15] -= (playerp[11]-playerp[15])*d;
playerp[16] -= (playerp[12]-playerp[16])*d;
playerp[11] += (playerp[11]-playerp[15])*d;
playerp[12] += (playerp[12]-playerp[16])*d;
d = 25/(pow((playerp->legs[8]-playerp->legs[12]), 2) + pow((playerp->legs[9]-playerp->legs[13]), 2)+25) - 0.5;
playerp->legs[12] -= (playerp->legs[8]-playerp->legs[12])*d;
playerp->legs[13] -= (playerp->legs[9]-playerp->legs[13])*d;
playerp->legs[8] += (playerp->legs[8]-playerp->legs[12])*d;
playerp->legs[9] += (playerp->legs[9]-playerp->legs[13])*d;
d = 36/(pow((playerp[3]-parts[i].x), 2) + pow((playerp[4]-parts[i].y), 2)+36) - 0.5;
parts[i].vx -= (playerp[3]-parts[i].x)*d;
parts[i].vy -= (playerp[4]-parts[i].y)*d;
playerp[3] += (playerp[3]-parts[i].x)*d;
playerp[4] += (playerp[4]-parts[i].y)*d;
d = 36/(pow((playerp->legs[0]-parts[i].x), 2) + pow((playerp->legs[1]-parts[i].y), 2)+36) - 0.5;
parts[i].vx -= (playerp->legs[0]-parts[i].x)*d;
parts[i].vy -= (playerp->legs[1]-parts[i].y)*d;
playerp->legs[0] += (playerp->legs[0]-parts[i].x)*d;
playerp->legs[1] += (playerp->legs[1]-parts[i].y)*d;
d = 36/(pow((playerp[11]-parts[i].x), 2) + pow((playerp[12]-parts[i].y), 2)+36) - 0.5;
parts[i].vx -= (playerp[11]-parts[i].x)*d;
parts[i].vy -= (playerp[12]-parts[i].y)*d;
playerp[11] += (playerp[11]-parts[i].x)*d;
playerp[12] += (playerp[12]-parts[i].y)*d;
d = 36/(pow((playerp->legs[8]-parts[i].x), 2) + pow((playerp->legs[9]-parts[i].y), 2)+36) - 0.5;
parts[i].vx -= (playerp->legs[8]-parts[i].x)*d;
parts[i].vy -= (playerp->legs[9]-parts[i].y)*d;
playerp->legs[8] += (playerp->legs[8]-parts[i].x)*d;
playerp->legs[9] += (playerp->legs[9]-parts[i].y)*d;
if (!eval_move(PT_DUST, playerp[7], playerp[8], NULL))
if (!eval_move(PT_DUST, playerp->legs[4], playerp->legs[5], NULL))
{
playerp[7] = playerp[9];
playerp[8] = playerp[10];
playerp->legs[4] = playerp->legs[6];
playerp->legs[5] = playerp->legs[7];
}
if (!eval_move(PT_DUST, playerp[15], playerp[16], NULL))
if (!eval_move(PT_DUST, playerp->legs[12], playerp->legs[13], NULL))
{
playerp[15] = playerp[17];
playerp[16] = playerp[18];
playerp->legs[12] = playerp->legs[14];
playerp->legs[13] = playerp->legs[15];
}
//This makes stick man "pop" from obstacles
if (!eval_move(PT_DUST, playerp[7], playerp[8], NULL))
if (!eval_move(PT_DUST, playerp->legs[4], playerp->legs[5], NULL))
{
float t;
t = playerp[7]; playerp[7] = playerp[9]; playerp[9] = t;
t = playerp[8]; playerp[8] = playerp[10]; playerp[10] = t;
t = playerp->legs[4]; playerp->legs[4] = playerp->legs[6]; playerp->legs[6] = t;
t = playerp->legs[5]; playerp->legs[5] = playerp->legs[7]; playerp->legs[7] = t;
}
if (!eval_move(PT_DUST, playerp[15], playerp[16], NULL))
if (!eval_move(PT_DUST, playerp->legs[12], playerp->legs[13], NULL))
{
float t;
t = playerp[15]; playerp[15] = playerp[17]; playerp[17] = t;
t = playerp[16]; playerp[16] = playerp[18]; playerp[18] = t;
t = playerp->legs[12]; playerp->legs[12] = playerp->legs[14]; playerp->legs[14] = t;
t = playerp->legs[13]; playerp->legs[13] = playerp->legs[15]; playerp->legs[15] = t;
}
//Keeping legs distance
if ((pow((playerp[7] - playerp[15]), 2) + pow((playerp[8]-playerp[16]), 2))<16)
if ((pow((playerp->legs[4] - playerp->legs[12]), 2) + pow((playerp->legs[5]-playerp->legs[13]), 2))<16)
{
float tvx, tvy;
tvx = -gvy;
@ -372,15 +372,15 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
if (tvx || tvy)
{
playerp[21] -= 0.2*tvx/hypot(tvx, tvy);
playerp[22] -= 0.2*tvy/hypot(tvx, tvy);
playerp->accs[2] -= 0.2*tvx/hypot(tvx, tvy);
playerp->accs[3] -= 0.2*tvy/hypot(tvx, tvy);
playerp[25] += 0.2*tvx/hypot(tvx, tvy);
playerp[26] += 0.2*tvy/hypot(tvx, tvy);
playerp->accs[6] += 0.2*tvx/hypot(tvx, tvy);
playerp->accs[7] += 0.2*tvy/hypot(tvx, tvy);
}
}
if ((pow((playerp[3] - playerp[11]), 2) + pow((playerp[4]-playerp[12]), 2))<16)
if ((pow((playerp->legs[0] - playerp->legs[8]), 2) + pow((playerp->legs[1]-playerp->legs[9]), 2))<16)
{
float tvx, tvy;
tvx = -gvy;
@ -388,25 +388,27 @@ int run_stickman(float* playerp, UPDATE_FUNC_ARGS) {
if (tvx || tvy)
{
playerp[19] -= 0.2*tvx/hypot(tvx, tvy);
playerp[20] -= 0.2*tvy/hypot(tvx, tvy);
playerp->accs[0] -= 0.2*tvx/hypot(tvx, tvy);
playerp->accs[1] -= 0.2*tvy/hypot(tvx, tvy);
playerp[23] += 0.2*tvx/hypot(tvx, tvy);
playerp[24] += 0.2*tvy/hypot(tvx, tvy);
playerp->accs[4] += 0.2*tvx/hypot(tvx, tvy);
playerp->accs[5] += 0.2*tvy/hypot(tvx, tvy);
}
}
//If legs touch something
STKM_interact(playerp, i, (int)(playerp[7]+0.5), (int)(playerp[8]+0.5));
STKM_interact(playerp, i, (int)(playerp[15]+0.5), (int)(playerp[16]+0.5));
STKM_interact(playerp, i, (int)(playerp->legs[4]+0.5), (int)(playerp->legs[5]+0.5));
STKM_interact(playerp, i, (int)(playerp->legs[12]+0.5), (int)(playerp->legs[13]+0.5));
STKM_interact(playerp, i, (int)(playerp->legs[4]+0.5), (int)playerp->legs[5]);
STKM_interact(playerp, i, (int)(playerp->legs[12]+0.5), (int)playerp->legs[13]);
if (!parts[i].type)
return 1;
parts[i].ctype = playerp[2];
parts[i].ctype = playerp->elem;
return 0;
}
void STKM_interact(float* playerp, int i, int x, int y)
void STKM_interact(playerst* playerp, int i, int x, int y)
{
int r;
if (x<0 || y<0 || x>=XRES || y>=YRES || !parts[i].type)
@ -414,15 +416,15 @@ void STKM_interact(float* playerp, int i, int x, int y)
r = pmap[y][x];
if (r)
{
if ((r&0xFF)==PT_SPRK && playerp[2]!=PT_LIGH) //If on charge
if ((r&0xFF)==PT_SPRK && playerp->elem!=PT_LIGH) //If on charge
{
parts[i].life -= (int)(rand()*20/RAND_MAX)+32;
}
if (ptypes[r&0xFF].hconduct && ((playerp[2]!=PT_LIGH && parts[r>>8].temp>=323) || parts[r>>8].temp<=243))
if (ptypes[r&0xFF].hconduct && ((playerp->elem!=PT_LIGH && parts[r>>8].temp>=323) || parts[r>>8].temp<=243))
{
parts[i].life -= 2;
playerp[22] -= 1;
playerp->accs[3] -= 1;
}
if ((r&0xFF)==PT_ACID) //If on acid
@ -445,37 +447,37 @@ void STKM_interact(float* playerp, int i, int x, int y)
{
portalp[parts[r>>8].tmp][count][nnx] = parts[i];
kill_part(i);
playerp[27] = 1;//stop SPWN creating a new STKM while he is in portal
playerp->spwn = 1;//stop SPWN creating a new STKM while he is in portal
break;
}
}
}
}
void STKM_init_legs(float* playerp, int i)
void STKM_init_legs(playerst* playerp, int i)
{
int x, y;
x = (int)(parts[i].x+0.5f);
y = (int)(parts[i].y+0.5f);
playerp[3] = x-1;
playerp[4] = y+6;
playerp[5] = x-1;
playerp[6] = y+6;
playerp->legs[0] = x-1;
playerp->legs[1] = y+6;
playerp->legs[2] = x-1;
playerp->legs[3] = y+6;
playerp[7] = x-3;
playerp[8] = y+12;
playerp[9] = x-3;
playerp[10] = y+12;
playerp->legs[4] = x-3;
playerp->legs[5] = y+12;
playerp->legs[6] = x-3;
playerp->legs[7] = y+12;
playerp[11] = x+1;
playerp[12] = y+6;
playerp[13] = x+1;
playerp[14] = y+6;
playerp->legs[8] = x+1;
playerp->legs[9] = y+6;
playerp->legs[10] = x+1;
playerp->legs[11] = y+6;
playerp[15] = x+3;
playerp[16] = y+12;
playerp[17] = x+3;
playerp[18] = y+12;
playerp->legs[12] = x+3;
playerp->legs[13] = y+12;
playerp->legs[14] = x+3;
playerp->legs[15] = y+12;
}

12
src/elements/stkm2.c
View File

@ -1,25 +1,25 @@
#include <element.h>
int update_SPAWN2(UPDATE_FUNC_ARGS) {
if (!player2[27])
if (!player2.spwn)
create_part(-1, x, y, PT_STKM2);
return 0;
}
int update_STKM2(UPDATE_FUNC_ARGS) {
run_stickman(player2, UPDATE_FUNC_SUBCALL_ARGS);
run_stickman(&player2, UPDATE_FUNC_SUBCALL_ARGS);
return 0;
}
int graphics_STKM2(GRAPHICS_FUNC_ARGS)
{
*pixel_mode = PSPEC_STICKMAN;
if ((int)player2[2]<PT_NUM)
if ((int)player2.elem<PT_NUM)
{
*colr = PIXR(ptypes[(int)player2[2]].pcolors);
*colg = PIXG(ptypes[(int)player2[2]].pcolors);
*colb = PIXB(ptypes[(int)player2[2]].pcolors);
*colr = PIXR(ptypes[player2.elem].pcolors);
*colg = PIXG(ptypes[player2.elem].pcolors);
*colb = PIXB(ptypes[player2.elem].pcolors);
}
else
{

67
src/graphics.c
View File

@ -1785,12 +1785,16 @@ void render_parts(pixel *vid)
if(pixel_mode & PSPEC_STICKMAN)
{
//Special case for stickman
#ifdef OGLR
float *cplayer;
playerst *cplayer;
if(t==PT_STKM)
cplayer = player;
cplayer = &player;
else if(t==PT_STKM2)
cplayer = &player2;
else if(t==PT_FIGH)
cplayer = &fighters[(unsigned char)parts[i].tmp];
else
cplayer = player2;
continue;
#ifdef OGLR
glColor4f(((float)colr)/255.0f, ((float)colg)/255.0f, ((float)colb)/255.0f, 1.0f);
glEnable(GL_LINE_SMOOTH);
glBegin(GL_LINE_STRIP);
@ -1806,21 +1810,19 @@ void render_parts(pixel *vid)
glColor4f(0.6f, 0.6f, 1.0f, 1.0f);
glBegin(GL_LINES);
glVertex2f(nx, ny+3);
glVertex2f(cplayer[3], cplayer[4]);
glVertex2f(cplayer->legs[0], cplayer->legs[1]);
glVertex2f(cplayer[3], cplayer[4]);
glVertex2f(cplayer[7], cplayer[8]);
glVertex2f(cplayer->legs[0], cplayer->legs[1]);
glVertex2f(cplayer->legs[4], cplayer->legs[5]);
glVertex2f(nx, ny+3);
glVertex2f(cplayer[11], cplayer[12]);
glVertex2f(cplayer->legs[8], cplayer->legs[9]);
glVertex2f(cplayer[11], cplayer[12]);
glVertex2f(cplayer[15], cplayer[16]);
glVertex2f(cplayer->legs[8], cplayer->legs[9]);
glVertex2f(cplayer->legs[12], cplayer->legs[13]);
glEnd();
glDisable(GL_LINE_SMOOTH);
#else
if (t==PT_STKM)
{
char buff[20]; //Buffer for HP
int s;
pixel pc;
@ -1831,7 +1833,7 @@ void render_parts(pixel *vid)
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]<PT_NUM) pc = ptypes[(int)player[2]].pcolors;
if (cplayer->elem<PT_NUM) pc = ptypes[cplayer->elem].pcolors;
else pc = PIXPACK(0xFFFFFF);
s = XRES+BARSIZE;
//head
@ -1840,37 +1842,10 @@ void render_parts(pixel *vid)
draw_line(vid , nx-2, ny-2, nx-2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s);
draw_line(vid , nx+2, ny-2, nx+2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s);
//legs
draw_line(vid , nx, ny+3, player[3], player[4], 255, 255, 255, s);
draw_line(vid , player[3], player[4], player[7], player[8], 255, 255, 255, s);
draw_line(vid , nx, ny+3, player[11], player[12], 255, 255, 255, s);
draw_line(vid , player[11], player[12], player[15], player[16], 255, 255, 255, s);
}
else if (t==PT_STKM2)
{
char buff[20]; //Buffer for HP
int s;
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]<PT_NUM) pc = ptypes[(int)player2[2]].pcolors;
else pc = PIXPACK(0xFFFFFF);
s = XRES+BARSIZE;
//head
draw_line(vid , nx-2, ny+2, nx+2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s);
draw_line(vid , nx-2, ny-2, nx+2, ny-2, PIXR(pc), PIXG(pc), PIXB(pc), s);
draw_line(vid , nx-2, ny-2, nx-2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s);
draw_line(vid , nx+2, ny-2, nx+2, ny+2, PIXR(pc), PIXG(pc), PIXB(pc), s);
//legs
draw_line(vid , nx, ny+3, player2[3], player2[4], 100, 100, 255, s);
draw_line(vid , player2[3], player2[4], player2[7], player2[8], 100, 100, 255, s);
draw_line(vid , nx, ny+3, player2[11], player2[12], 100, 100, 255, s);
draw_line(vid , player2[11], player2[12], player2[15], player2[16], 100, 100, 255, s);
}
draw_line(vid , nx, ny+3, cplayer->legs[0], cplayer->legs[1], 255, 255, 255, s);
draw_line(vid , cplayer->legs[0], cplayer->legs[1], cplayer->legs[4], cplayer->legs[5], 255, 255, 255, s);
draw_line(vid , nx, ny+3, cplayer->legs[8], cplayer->legs[9], 255, 255, 255, s);
draw_line(vid , cplayer->legs[8], cplayer->legs[9], cplayer->legs[12], cplayer->legs[13], 255, 255, 255, s);
#endif
}
if(pixel_mode & PMODE_FLAT)
@ -3390,10 +3365,10 @@ pixel *prerender_save(void *save, int size, int *width, int *height)
j=d[p++];
if (j<PT_NUM && j>0)
{
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<w are checked in draw_line
draw_line(fb , x-2, y-2, x+2, y-2, PIXR(hc), PIXG(hc), PIXB(hc), w);

40
src/interface.c
View File

@ -2495,36 +2495,36 @@ int sdl_poll(void)
//1 8 2
if (event.key.keysym.sym == SDLK_RIGHT)
{
player[0] = (int)(player[0])|0x02; //Go right command
player.comm = (int)(player.comm)|0x02; //Go right command
}
if (event.key.keysym.sym == SDLK_LEFT)
{
player[0] = (int)(player[0])|0x01; //Go left command
player.comm = (int)(player.comm)|0x01; //Go left command
}
if (event.key.keysym.sym == SDLK_DOWN && ((int)(player[0])&0x08)!=0x08)
if (event.key.keysym.sym == SDLK_DOWN && ((int)(player.comm)&0x08)!=0x08)
{
player[0] = (int)(player[0])|0x08; //Go left command
player.comm = (int)(player.comm)|0x08; //Go left command
}
if (event.key.keysym.sym == SDLK_UP && ((int)(player[0])&0x04)!=0x04)
if (event.key.keysym.sym == SDLK_UP && ((int)(player.comm)&0x04)!=0x04)
{
player[0] = (int)(player[0])|0x04; //Jump command
player.comm = (int)(player.comm)|0x04; //Jump command
}
if (event.key.keysym.sym == SDLK_d)
{
player2[0] = (int)(player2[0])|0x02; //Go right command
player2.comm = (int)(player2.comm)|0x02; //Go right command
}
if (event.key.keysym.sym == SDLK_a)
{
player2[0] = (int)(player2[0])|0x01; //Go left command
player2.comm = (int)(player2.comm)|0x01; //Go left command
}
if (event.key.keysym.sym == SDLK_s && ((int)(player2[0])&0x08)!=0x08)
if (event.key.keysym.sym == SDLK_s && ((int)(player2.comm)&0x08)!=0x08)
{
player2[0] = (int)(player2[0])|0x08; //Go left command
player2.comm = (int)(player2.comm)|0x08; //Go left command
}
if (event.key.keysym.sym == SDLK_w && ((int)(player2[0])&0x04)!=0x04)
if (event.key.keysym.sym == SDLK_w && ((int)(player2.comm)&0x04)!=0x04)
{
player2[0] = (int)(player2[0])|0x04; //Jump command
player2.comm = (int)(player2.comm)|0x04; //Jump command
}
break;
@ -2536,30 +2536,30 @@ int sdl_poll(void)
sdl_zoom_trig = 0;
if (event.key.keysym.sym == SDLK_RIGHT || event.key.keysym.sym == SDLK_LEFT)
{
player[1] = player[0]; //Saving last movement
player[0] = (int)(player[0])&12; //Stop command
player.pcomm = player.comm; //Saving last movement
player.comm = (int)(player.comm)&12; //Stop command
}
if (event.key.keysym.sym == SDLK_UP)
{
player[0] = (int)(player[0])&11;
player.comm = (int)(player.comm)&11;
}
if (event.key.keysym.sym == SDLK_DOWN)
{
player[0] = (int)(player[0])&7;
player.comm = (int)(player.comm)&7;
}
if (event.key.keysym.sym == SDLK_d || event.key.keysym.sym == SDLK_a)
{
player2[1] = player2[0]; //Saving last movement
player2[0] = (int)(player2[0])&12; //Stop command
player2.pcomm = player2.comm; //Saving last movement
player2.comm = (int)(player2.comm)&12; //Stop command
}
if (event.key.keysym.sym == SDLK_w)
{
player2[0] = (int)(player2[0])&11;
player2.comm = (int)(player2.comm)&11;
}
if (event.key.keysym.sym == SDLK_s)
{
player2[0] = (int)(player2[0])&7;
player2.comm = (int)(player2.comm)&7;
}
break;
case SDL_MOUSEBUTTONDOWN:

52
src/main.c
View File

@ -977,21 +977,19 @@ int parse_save(void *save, int size, int replace, int x0, int y0, unsigned char
// no more particle properties to load, so we can change type here without messing up loading
if (i && i<=NPART)
{
if ((player[27] == 1 && ty==PT_STKM) || (player2[27] == 1 && ty==PT_STKM2))
if ((player.spwn == 1 && ty==PT_STKM) || (player2.spwn == 1 && ty==PT_STKM2))
{
parts[i-1].type = PT_NONE;
}
else if (parts[i-1].type == PT_STKM)
{
//player[2] = PT_DUST;
STKM_init_legs(player, i-1);
player[27] = 1;
STKM_init_legs(&player, i-1);
player.spwn = 1;
}
else if (parts[i-1].type == PT_STKM2)
{
//player2[2] = PT_DUST;
STKM_init_legs(player2, i-1);
player2[27] = 1;
STKM_init_legs(&player2, i-1);
player2.spwn = 1;
}
if (ver<48 && (ty==OLD_PT_WIND || (ty==PT_BRAY&&parts[i-1].life==0)))
@ -1110,9 +1108,11 @@ void clear_sim(void)
memset(wireless, 0, sizeof(wireless));
memset(gol2, 0, sizeof(gol2));
memset(portalp, 0, sizeof(portalp));
memset(fighters, 0, sizeof(fighters));
fighcount = 0;
ISSPAWN1 = ISSPAWN2 = 0;
player[27] = 0;
player2[27] = 0;
player.spwn = 0;
player2.spwn = 0;
memset(pers_bg, 0, (XRES+BARSIZE)*YRES*PIXELSIZE);
memset(fire_r, 0, sizeof(fire_r));
memset(fire_g, 0, sizeof(fire_g));
@ -1494,8 +1494,8 @@ int main(int argc, char *argv[])
pers_bg = calloc((XRES+BARSIZE)*YRES, PIXELSIZE);
prepare_alpha(4, 1.0f);
player[2] = player2[2] = PT_DUST;
player[28] = player2[28] = 0;
player.elem = player2.elem = PT_DUST;
player.frames = player2.frames = 0;
sprintf(ppmfilename, "%s.ppm", argv[2]);
sprintf(ptifilename, "%s.pti", argv[2]);
@ -2152,7 +2152,7 @@ int main(int argc, char *argv[])
free(load_data);
}
}
if (sdl_key=='s' && ((sdl_mod & (KMOD_CTRL)) || !player2[27]))
if (sdl_key=='s' && ((sdl_mod & (KMOD_CTRL)) || !player2.spwn))
{
if (it > 50)
it = 50;
@ -2286,7 +2286,7 @@ int main(int argc, char *argv[])
bsy = 0;
}
}
if (sdl_key=='d' && ((sdl_mod & (KMOD_CTRL)) || !player2[27]))
if (sdl_key=='d' && ((sdl_mod & (KMOD_CTRL)) || !player2.spwn))
DEBUG_MODE = !DEBUG_MODE;
if (sdl_key=='i')
{
@ -2370,7 +2370,7 @@ int main(int argc, char *argv[])
}
}
if (sdl_key=='w' && (!player2[27] || (sdl_mod & (KMOD_SHIFT)))) //Gravity, by Moach
if (sdl_key=='w' && (!player2.spwn || (sdl_mod & (KMOD_SHIFT)))) //Gravity, by Moach
{
++gravityMode; // cycle gravity mode
itc = 51;
@ -3123,7 +3123,7 @@ int main(int argc, char *argv[])
c = (b&1) ? sl : sr; //c is element to be spawned
su = c;
if (c!=WL_SIGN+100)
if (c!=WL_SIGN+100 && c!=PT_FIGH)
{
if (!bq)
for (signi=0; signi<MAXSIGNS; signi++)
@ -3152,6 +3152,12 @@ int main(int argc, char *argv[])
if (!bq)
add_sign_ui(vid_buf, x, y);
}
if (c==PT_FIGH)
{
if (!bq)
create_part(-1, x, y, PT_FIGH);
}
//for the click functions, lx and ly, are the positions of where the FIRST click happened. x,y are current mouse position.
else if (lb)//lb means you are holding mouse down
{
@ -3586,19 +3592,19 @@ int main(int argc, char *argv[])
sdl_blit(0, 0, XRES+BARSIZE, YRES+MENUSIZE, vid_buf, XRES+BARSIZE);
//Setting an element for the stick man
if (player[27]==0)
if (player.spwn==0)
{
if ((sr<PT_NUM && ptypes[sr].falldown>0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT)
player[2] = sr;
if ((sr<PT_NUM && ptypes[sr].falldown>0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT || sr == PT_LIGH)
player.elem = sr;
else
player[2] = PT_DUST;
player.elem = PT_DUST;
}
if (player2[27]==0)
if (player2.spwn==0)
{
if ((sr<PT_NUM && ptypes[sr].falldown>0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT)
player2[2] = sr;
if ((sr<PT_NUM && ptypes[sr].falldown>0) || sr==SPC_AIR || sr == PT_NEUT || sr == PT_PHOT || sr == PT_LIGH)
player2.elem = sr;
else
player2[2] = PT_DUST;
player2.elem = PT_DUST;
}
}
SDL_CloseAudio();

100
src/powder.c
View File

@ -11,10 +11,11 @@ int wire_placed = 0;
int lighting_recreate = 0;
//[0] is a command cell, [3]-[18] are legs positions, [19]-[26] are accelerations, [27] shows if player was spawned
//[28] is frames since last particle spawn - used when spawning LIGH
float player[29];
float player2[29];
playerst player;
playerst player2;
playerst fighters[256]; //255 is the maximum number of fighters
unsigned char fighcount = 0; //Contains the number of fighters
particle *parts;
particle *cb_parts;
@ -110,6 +111,7 @@ void init_can_move()
//all stickman collisions are done in stickman update function
can_move[PT_STKM][t] = 2;
can_move[PT_STKM2][t] = 2;
can_move[PT_FIGH][t] = 2;
}
for (t=0;t<PT_NUM;t++)
{
@ -120,6 +122,7 @@ void init_can_move()
//all stickman collisions are done in stickman update function
can_move[t][PT_STKM] = 2;
can_move[t][PT_STKM2] = 2;
can_move[PT_FIGH][t] = 2;
//INVIS behaviour varies with pressure
can_move[t][PT_INVIS] = 3;
//stop CNCT being displaced by other particles
@ -304,11 +307,16 @@ int try_move(int i, int x, int y, int nx, int ny)
{
if (parts[i].type == PT_STKM)
{
player[27] = 0;
player.spwn = 0;
}
if (parts[i].type == PT_STKM2)
{
player2[27] = 0;
player2.spwn = 0;
}
if (parts[i].type == PT_FIGH)
{
fighters[(unsigned char)parts[i].tmp].spwn = 0;
fighcount--;
}
parts[i].type=PT_NONE;
return 0;
@ -317,11 +325,16 @@ int try_move(int i, int x, int y, int nx, int ny)
{
if (parts[i].type == PT_STKM)
{
player[27] = 0;
player.spwn = 0;
}
if (parts[i].type == PT_STKM2)
{
player2[27] = 0;
player2.spwn = 0;
}
if (parts[i].type == PT_FIGH)
{
fighters[(unsigned char)parts[i].tmp].spwn = 0;
fighcount--;
}
parts[i].type=PT_NONE;
if (!legacy_enable)
@ -586,11 +599,16 @@ void kill_part(int i)//kills particle number i
y = (int)(parts[i].y+0.5f);
if (parts[i].type == PT_STKM)
{
player[27] = 0;
player.spwn = 0;
}
if (parts[i].type == PT_STKM2)
{
player2[27] = 0;
player2.spwn = 0;
}
if (parts[i].type == PT_FIGH)
{
fighters[(unsigned char)parts[i].tmp].spwn = 0;
fighcount--;
}
if (parts[i].type == PT_SPAWN)
{
@ -628,10 +646,16 @@ inline void part_change_type(int i, int x, int y, int t)//changes the type of pa
t = PT_NONE;
if (parts[i].type == PT_STKM)
player[27] = 0;
player.spwn = 0;
if (parts[i].type == PT_STKM2)
player2[27] = 0;
player2.spwn = 0;
if (parts[i].type == PT_FIGH)
{
fighters[(unsigned char)parts[i].tmp].spwn = 0;
fighcount--;
}
parts[i].type = t;
if (t==PT_PHOT || t==PT_NEUT)
@ -761,7 +785,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
{
if ((pmap[y][x]&0xFF)!=PT_SPAWN&&(pmap[y][x]&0xFF)!=PT_SPAWN2)
{
if (t!=PT_STKM&&t!=PT_STKM2)
if (t!=PT_STKM&&t!=PT_STKM2&&t!=PT_FIGH)
{
return -1;
}
@ -787,7 +811,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
t!=PT_CLNE&&t!=PT_PCLN&&
t!=PT_BCLN&&t!=PT_STKM&&
t!=PT_STKM2&&t!=PT_PBCN&&
t!=PT_STOR)
t!=PT_STOR&&t!=PT_FIGH)
)
{
parts[pmap[y][x]>>8].ctype = t;
@ -836,7 +860,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;
@ -961,7 +985,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
}
if (t==PT_STKM)
{
if (player[27]==0)
if (player.spwn==0)
{
parts[i].x = (float)x;
parts[i].y = (float)y;
@ -971,8 +995,8 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
parts[i].life = 100;
parts[i].ctype = 0;
parts[i].temp = ptypes[t].heat;
STKM_init_legs(player, i);
player[27] = 1;
STKM_init_legs(&player, i);
player.spwn = 1;
}
else
{
@ -983,7 +1007,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
}
if (t==PT_STKM2)
{
if (player2[27]==0)
if (player2.spwn==0)
{
parts[i].x = (float)x;
parts[i].y = (float)y;
@ -993,8 +1017,8 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
parts[i].life = 100;
parts[i].ctype = 0;
parts[i].temp = ptypes[t].heat;
STKM_init_legs(player2, i);
player2[27] = 1;
STKM_init_legs(&player2, i);
player2.spwn = 1;
}
else
{
@ -1003,12 +1027,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].spwn==1) cunt++;
if (cunt < 100 && fighters[cunt].spwn==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].spwn = 1;
fighters[cunt].elem = 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 +1722,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 +1784,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,9 +2886,9 @@ 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){
prop_edit_ui(vid_buf, x, y);
return 0;