mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-17 13:51:09 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon
2010-10-22 00:01:57 +01:00
parent f88bb0f246 b015b636b2
commit 17c0b3d56c
1 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/powder.c
View File

@@ -59,6 +59,62 @@ static int eval_move(int pt, int nx, int ny, unsigned *rr)
{ {
unsigned r; unsigned r;
if(nx<0 || ny<0 || nx>=XRES || ny>=YRES)
return 0;
r = pmap[ny][nx];
if(r && (r>>8)<NPART)
r = (r&~0xFF) | parts[r>>8].type;
if(rr)
*rr = r;
if((r&0xFF)==PT_VOID || (r&0xFF)==PT_BHOL)
return 1;
if(pt==PT_PHOT&&(
(r&0xFF)==PT_GLAS || (r&0xFF)==PT_PHOT ||
(r&0xFF)==PT_CLNE || (r&0xFF)==PT_PCLN ||
(r&0xFF)==PT_GLOW || (r&0xFF)==PT_WATR ||
(r&0xFF)==PT_DSTW || (r&0xFF)==PT_SLTW ||
((r&0xFF)==PT_LCRY&&parts[r>>8].life > 5)))
return 2;
if(pt==PT_NEUT&&(
(r&0xFF)==PT_GLAS || (r&0xFF)==PT_PHOT ||
(r&0xFF)==PT_CLNE || (r&0xFF)==PT_PCLN ||
(r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW ||
(r&0xFF)==PT_SLTW || (r%0xFF)==PT_PLUT))
return 2;
if(pt==PT_STKM) //Stick man's head shouldn't collide
return 2;
if(bmap[ny/CELL][nx/CELL]==13 && ptypes[pt].falldown!=0 && pt!=PT_FIRE && pt!=PT_SMKE)
return 0;
if(ptypes[pt].falldown!=2 && bmap[ny/CELL][nx/CELL]==3)
return 0;
if((pt==PT_NEUT ||pt==PT_PHOT) && bmap[ny/CELL][nx/CELL]==7 && !emap[ny/CELL][nx/CELL])
return 0;
if(bmap[ny/CELL][nx/CELL]==9)
return 0;
if(ptypes[pt].falldown!=1 && bmap[ny/CELL][nx/CELL]==10)
return 0;
if (r && ((r&0xFF) >= PT_NUM || (ptypes[pt].weight <= ptypes[(r&0xFF)].weight)))
return 0;
if(pt == PT_PHOT)
return 2;
if(pt==PT_NEUT)
return 2;
return 1;
}
/*static int eval_move(int pt, int nx, int ny, unsigned *rr)
{
unsigned r;
if(nx<0 || ny<0 || nx>=XRES || ny>=YRES) if(nx<0 || ny<0 || nx>=XRES || ny>=YRES)
return 0; return 0;
@@ -111,7 +167,7 @@ static int eval_move(int pt, int nx, int ny, unsigned *rr)
return 1; return 1;
} }
*/
static void create_cherenkov_photon(int pp); static void create_cherenkov_photon(int pp);
static void create_gain_photon(int pp); static void create_gain_photon(int pp);