walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

EF_STATIC now means entity will never move (not even rotate).

This commit is contained in:
Steve 2015-12-10 11:46:57 +00:00
parent da692862b9
commit a5f8be0586
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/fighters/rocketTurret.json
View File

@ -13,6 +13,6 @@
"y" : 0
}
],
"flags" : "EF_STATIC+EF_TAKES_DAMAGE",
"flags" : "EF_TAKES_DAMAGE",
"aiFlags" : "AIF_MISSILE_BOAT+AIF_AGGRESSIVE+AIF_INSTANT_DIE+AIF_LONG_RANGE_FIRE"
}

3
src/battle/ai.c
View File

@ -84,7 +84,7 @@ void doAI(void)
if (!(self->aiFlags & AIF_AVOIDS_COMBAT))
{
if (!(self->flags & EF_STATIC))
if (self->speed)
{
doFighterAI();
}
@ -92,6 +92,7 @@ void doAI(void)
{
doGunAI();
}
return;
}

4
src/battle/entities.c
View File

@ -110,7 +110,7 @@ void doEntities(void)
restrictToGrid(e);
if (e->flags & EF_STATIC)
if (!e->speed)
{
e->dx = e->dy = 0;
}
@ -283,7 +283,7 @@ static void alignComponents(void)
e->x = x;
e->y = y;
if (e->type == ET_CAPITAL_SHIP_COMPONENT || e->type == ET_CAPITAL_SHIP_ENGINE)
if (e->flags & EF_STATIC)
{
e->angle = e->owner->angle;
}

1
src/battle/extractionPoint.c
View File

@ -32,7 +32,6 @@ Entity *spawnExtractionPoint(void)
extractionPoint->texture = getTexture("gfx/entities/extractionPoint.png");
extractionPoint->action = think;
extractionPoint->flags |= EF_NO_MT_BOX;
extractionPoint->flags |= EF_STATIC;
return extractionPoint;
}

1
src/battle/waypoints.c
View File

@ -44,7 +44,6 @@ Entity *spawnWaypoint(void)
waypoint->flags = EF_MISSION_TARGET;
waypoint->action = think;
waypoint->flags |= EF_NO_MT_BOX;
waypoint->flags |= EF_STATIC;
return waypoint;
}