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

Fix "blow power" for stick man, disable rocket boots on E-hole.

Browse Source
This commit is contained in:
Saveliy Skresanov 2013-05-08 23:08:29 +07:00
parent 645bcb1bcd
commit 9893f59657
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/graphics/Renderer.cpp
View File

@ -1389,9 +1389,18 @@ void Renderer::render_parts()
{
if (cplayer->elem<PT_NUM && cplayer->elem > 0)
{
colr = PIXR(elements[cplayer->elem].Colour);
colg = PIXG(elements[cplayer->elem].Colour);
colb = PIXB(elements[cplayer->elem].Colour);
if (cplayer->elem == SPC_AIR)
{
colr = PIXR(0x8080FF);
colg = PIXG(0x8080FF);
colb = PIXB(0x8080FF);
}
else
{
colr = PIXR(elements[cplayer->elem].Colour);
colg = PIXG(elements[cplayer->elem].Colour);
colb = PIXB(elements[cplayer->elem].Colour);
}
}
else
{

2
src/simulation/Simulation.cpp
View File

@ -2709,7 +2709,7 @@ int Simulation::create_part(int p, int x, int y, int tv)
if (x<0 || y<0 || x>=XRES || y>=YRES || ((t<=0 || t>=PT_NUM)&&t!=SPC_HEAT&&t!=SPC_COOL&&t!=SPC_AIR&&t!=SPC_VACUUM&&t!=SPC_PGRV&&t!=SPC_NGRV))
return -1;
if (t>=0 && t<PT_NUM && !elements[t].Enabled)
if (t>=0 && t<PT_NUM && !elements[t].Enabled && t!=SPC_AIR)
return -1;
if(t==SPC_PROP) {
return -1; //Prop tool works on a mouse click basic, make sure it doesn't do anything here

5
src/simulation/elements/STKM.cpp
View File

@ -392,10 +392,9 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
sim->kill_part(r>>8);
}
if (sim->bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN)
{
playerp->rocketBoots = false;
playerp->elem = SPC_AIR;
}
else if (sim->bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_EHOLE)
playerp->rocketBoots = false;
else if (sim->bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_GRAV && parts[i].type!=PT_FIGH)
playerp->rocketBoots = true;
if ((r&0xFF)==PT_PRTI)