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

Fix WHOL/VENT not eating ANAR, and fix PVOD eating PHOT/NEUT when off

Browse Source
This commit is contained in:
jacksonmj 2011-10-06 03:51:48 +08:00 committed by Simon Robertshaw
parent 3e88325632
commit ae3241ec80
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/powder.c
View File

@ -133,8 +133,8 @@ void init_can_move()
can_move[PT_PHOT][PT_LCRY] = 3;//varies according to LCRY life can_move[PT_PHOT][PT_LCRY] = 3;//varies according to LCRY life
can_move[PT_NEUT][PT_INVIS] = 2; can_move[PT_NEUT][PT_INVIS] = 2;
//whol eats anar //whol eats anar
can_move[PT_ANAR][PT_WHOL] = 2; can_move[PT_ANAR][PT_WHOL] = 1;
can_move[PT_ANAR][PT_NWHL] = 2; can_move[PT_ANAR][PT_NWHL] = 1;
} }
/* /*
@ -168,6 +168,11 @@ int eval_move(int pt, int nx, int ny, unsigned *rr)
if (pv[ny/CELL][nx/CELL]>4.0f || pv[ny/CELL][nx/CELL]<-4.0f) result = 2; if (pv[ny/CELL][nx/CELL]>4.0f || pv[ny/CELL][nx/CELL]<-4.0f) result = 2;
else result = 0; else result = 0;
} }
if ((r&0xFF)==PT_PVOD)
{
if (parts[r>>8].life == 10) result = 1;
else result = 0;
}
} }
if (bmap[ny/CELL][nx/CELL]) if (bmap[ny/CELL][nx/CELL])
{ {
@ -288,7 +293,7 @@ int try_move(int i, int x, int y, int nx, int ny)
} }
//else e=1 , we are trying to swap the particles, return 0 no swap/move, 1 is still overlap/move, because the swap takes place later //else e=1 , we are trying to swap the particles, return 0 no swap/move, 1 is still overlap/move, because the swap takes place later
if ((r&0xFF)==PT_VOID) //this is where void eats particles if ((r&0xFF)==PT_VOID || (r&0xFF)==PT_PVOD) //this is where void eats particles
{ {
if (parts[i].type == PT_STKM) if (parts[i].type == PT_STKM)
{ {
@ -301,21 +306,6 @@ int try_move(int i, int x, int y, int nx, int ny)
parts[i].type=PT_NONE; parts[i].type=PT_NONE;
return 0; return 0;
} }
if ((r&0xFF)==PT_PVOD) //this is where void eats particles
{
if(parts[r>>8].life == 10){
if (parts[i].type == PT_STKM)
{
player[27] = 0;
}
if (parts[i].type == PT_STKM2)
{
player2[27] = 0;
}
parts[i].type=PT_NONE;
}
return 0;
}
if ((r&0xFF)==PT_BHOL || (r&0xFF)==PT_NBHL) //this is where blackhole eats particles if ((r&0xFF)==PT_BHOL || (r&0xFF)==PT_NBHL) //this is where blackhole eats particles
{ {
if (parts[i].type == PT_STKM) if (parts[i].type == PT_STKM)