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

Some cleanup

This commit is contained in:
onpon4 2016-01-09 07:50:12 -05:00
parent 9104fcaa10
commit efb7a135be
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/alien.cpp
View File

@ -1280,10 +1280,19 @@ bool alien_place(object *alien)
void alien_setAI(object *alien) void alien_setAI(object *alien)
{ {
int i;
float tx;
float ty;
int chase = 0; // Chance in 10 of chasing player
int area = 0; // Chance in 10 of moving to an area around the player
int stop = 0; // Chance in 10 of hanging back
int point = 0; // Size of area alien will move into
// Make friendly craft generally concentrate on smaller fighters // Make friendly craft generally concentrate on smaller fighters
if ((alien->flags & FL_FRIEND) && (alien->target == &aliens[ALIEN_BOSS])) if ((alien->flags & FL_FRIEND) && (alien->target == &aliens[ALIEN_BOSS]))
{ {
if ((rand() % 5) == 0) if (CHANCE(0.2))
{ {
alien->target = alien; alien->target = alien;
alien->thinktime = 0; alien->thinktime = 0;
@ -1291,14 +1300,9 @@ void alien_setAI(object *alien)
} }
} }
int i = rand() % 10; i = rand() % 10;
float tx = alien->target->x; tx = alien->target->x;
float ty = alien->target->y; ty = alien->target->y;
int chase = 0; // Chance in 10 of chasing player
int area = 0; // Chance in 10 of moving to an area around the player
int stop = 0; // Chance in 10 of hanging back
int point = 0; // Size of area alien will move into
switch (alien->AIType) switch (alien->AIType)
{ {
@ -1344,8 +1348,8 @@ void alien_setAI(object *alien)
else if ((i >= point) && (i <= stop)) else if ((i >= point) && (i <= stop))
{ {
// Fly to a random point around the target // Fly to a random point around the target
tx += (rand() % area - (rand() % area * 2)); tx += RANDRANGE(-area, area);
ty += (rand() % area - (rand() % area * 2)); ty += RANDRANGE(-area, area);
alien->dx = ((alien->x - tx) / ((300 / alien->speed) + rand() % 100)); alien->dx = ((alien->x - tx) / ((300 / alien->speed) + rand() % 100));
alien->dy = ((alien->y - ty) / ((300 / alien->speed) + rand() % 100)); alien->dy = ((alien->y - ty) / ((300 / alien->speed) + rand() % 100));
return; return;