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

TRON_NORANDOM flag

Browse Source
This commit is contained in:
jacob1
2012-12-06 18:42:46 -05:00
parent 2881eeb1b3
commit a15372afbf
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/simulation/elements/TRON.cpp
View File

@@ -53,6 +53,7 @@ Element_TRON::Element_TRON()
#define TRON_WAIT 4 //it was just created, so WAIT a frame #define TRON_WAIT 4 //it was just created, so WAIT a frame
#define TRON_NODIE 8 #define TRON_NODIE 8
#define TRON_DEATH 16 //Crashed, now dying #define TRON_DEATH 16 //Crashed, now dying
#define TRON_NORANDOM 65536
int tron_rx[4] = {-1, 0, 1, 0}; int tron_rx[4] = {-1, 0, 1, 0};
int tron_ry[4] = { 0,-1, 0, 1}; int tron_ry[4] = { 0,-1, 0, 1};
unsigned int tron_colours[32]; unsigned int tron_colours[32];
@@ -86,7 +87,7 @@ int Element_TRON::update(UPDATE_FUNC_ARGS)
//random turn //random turn
int random = rand()%340; int random = rand()%340;
if (random==1 || random==3) if ((random==1 || random==3) && !(parts[i].tmp & TRON_NORANDOM))
{ {
//randomly turn left(3) or right(1) //randomly turn left(3) or right(1)
direction = (direction + random)%4; direction = (direction + random)%4;
@@ -97,7 +98,12 @@ int Element_TRON::update(UPDATE_FUNC_ARGS)
firstdircheck = Element_TRON::trymovetron(sim,x,y,direction,i,parts[i].tmp2); firstdircheck = Element_TRON::trymovetron(sim,x,y,direction,i,parts[i].tmp2);
if (firstdircheck < parts[i].tmp2) if (firstdircheck < parts[i].tmp2)
{ {
if (originaldir != direction) //if we just tried a random turn, don't pick random again if (parts[i].tmp & TRON_NORANDOM)
{
seconddir = (direction + 1)%4;
lastdir = (direction + 3)%4;
}
else if (originaldir != direction) //if we just tried a random turn, don't pick random again
{ {
seconddir = originaldir; seconddir = originaldir;
lastdir = (direction + 2)%4; lastdir = (direction + 2)%4;
@@ -177,7 +183,7 @@ int Element_TRON::new_tronhead(Simulation * sim, int x, int y, int i, int direct
sim->parts[i].life = 5; sim->parts[i].life = 5;
} }
//give new head our properties //give new head our properties
sim->parts[np].tmp = 1 | direction<<5 | sim->parts[i].tmp&(TRON_NOGROW|TRON_NODIE) | (sim->parts[i].tmp&0xF800); sim->parts[np].tmp = 1 | direction<<5 | sim->parts[i].tmp&(TRON_NOGROW|TRON_NODIE|TRON_NORANDOM) | (sim->parts[i].tmp&0xF800);
if (np > i) if (np > i)
sim->parts[np].tmp |= TRON_WAIT; sim->parts[np].tmp |= TRON_WAIT;