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

Fixes for high life stickman

Browse Source
This commit is contained in:
jacksonmj 2011-06-22 16:24:23 +01:00 committed by Simon Robertshaw
parent 9b83bf27a8
commit 04b3eb11fd
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/elements/stkm.c
View File

@ -211,7 +211,8 @@ int update_STKM(UPDATE_FUNC_ARGS) {
if ((r&0xFF) == PT_NEUT) if ((r&0xFF) == PT_NEUT)
{ {
parts[i].life -= (102-parts[i].life)/2; if (parts[i].life<=100) parts[i].life -= (102-parts[i].life)/2;
else parts[i].life *= 0.9f;
kill_part(r>>8); kill_part(r>>8);
} }
if (bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN) if (bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN)

3
src/elements/stkm2.c
View File

@ -211,7 +211,8 @@ int update_STKM2(UPDATE_FUNC_ARGS) {
if ((r&0xFF) == PT_NEUT) if ((r&0xFF) == PT_NEUT)
{ {
parts[i].life -= (102-parts[i].life)/2; if (parts[i].life<=100) parts[i].life -= (102-parts[i].life)/2;
else parts[i].life *= 0.9f;
kill_part(r>>8); kill_part(r>>8);
} }
if (bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN) if (bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN)

4
src/graphics.c
View File

@ -1698,7 +1698,7 @@ void draw_parts(pixel *vid)
{ {
if (t==PT_STKM) //Just draw head here if (t==PT_STKM) //Just draw head here
{ {
char buff[10]; //Buffer for HP char buff[20]; //Buffer for HP
pixel pc; pixel pc;
if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head
@ -1726,7 +1726,7 @@ void draw_parts(pixel *vid)
} }
else if (t==PT_STKM2) //Just draw head here else if (t==PT_STKM2) //Just draw head here
{ {
char buff[10]; //Buffer for HP char buff[20]; //Buffer for HP
pixel pc; pixel pc;
if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head if (mousex>(nx-3) && mousex<(nx+3) && mousey<(ny+3) && mousey>(ny-3)) //If mous is in the head