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

Mark carried items on radar, so they don't become invisible during clean up runs.

This commit is contained in:
Steve 2018-03-07 07:51:40 +00:00
parent 009bb74a95
commit 22f7b02413
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/world/radar.c
View File

@ -350,7 +350,7 @@ static int isValidBlip(Entity *e)
return i->canBeCarried || i->canBePickedUp || i->isMissionTarget; return i->canBeCarried || i->canBePickedUp || i->isMissionTarget;
case ET_ENEMY: case ET_ENEMY:
return e->isMissionTarget || world.isEliminateAllEnemies; return e->isMissionTarget || ((Unit*)e)->carriedItem != NULL || world.isEliminateAllEnemies;
case ET_ITEM_PAD: case ET_ITEM_PAD:
return !e->active; return !e->active;
@ -365,6 +365,8 @@ static int isValidBlip(Entity *e)
static void getBlipColor(Entity *e, SDL_Color *c) static void getBlipColor(Entity *e, SDL_Color *c)
{ {
Unit *u;
c->r = c->g = c->b = 0; c->r = c->g = c->b = 0;
switch (e->type) switch (e->type)
@ -374,6 +376,18 @@ static void getBlipColor(Entity *e, SDL_Color *c)
break; break;
case ET_ENEMY: case ET_ENEMY:
u = (Unit*)e;
if (u->carriedItem != NULL)
{
c->g = 168;
c->b = 255;
}
else
{
c->r = 255;
}
break;
case ET_BOSS: case ET_BOSS:
case ET_DESTRUCTABLE: case ET_DESTRUCTABLE:
case ET_ITEM_PAD: case ET_ITEM_PAD: