Added green versions of arrows for friendly ships.
16
LICENSES
|
@ -64,6 +64,22 @@ License: CC BY-SA 3.0 <https://creativecommons.org/licenses/by-sa/3.0/>
|
||||||
|
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
|
gfx/friendArrowEast.png
|
||||||
|
gfx/friendArrowNorth.png
|
||||||
|
gfx/friendArrowNorthEast.png
|
||||||
|
gfx/friendArrowNorthWest.png
|
||||||
|
gfx/friendArrowSouth.png
|
||||||
|
gfx/friendArrowSouthEast.png
|
||||||
|
gfx/friendArrowSouthWest.png
|
||||||
|
gfx/friendArrowWest.png
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
Astrid S. de Wijn
|
||||||
|
onpon4
|
||||||
|
License: CC BY-SA 3.0 <https://creativecommons.org/licenses/by-sa/3.0/>
|
||||||
|
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
|
||||||
gfx/face_chris.png
|
gfx/face_chris.png
|
||||||
gfx/face_phoebe.png
|
gfx/face_phoebe.png
|
||||||
gfx/face_sid.png
|
gfx/face_sid.png
|
||||||
|
|
After Width: | Height: | Size: 123 B |
After Width: | Height: | Size: 115 B |
After Width: | Height: | Size: 129 B |
After Width: | Height: | Size: 130 B |
After Width: | Height: | Size: 123 B |
After Width: | Height: | Size: 129 B |
After Width: | Height: | Size: 126 B |
After Width: | Height: | Size: 124 B |
|
@ -367,6 +367,14 @@ enum {
|
||||||
SP_ARROW_SOUTHWEST,
|
SP_ARROW_SOUTHWEST,
|
||||||
SP_ARROW_WEST,
|
SP_ARROW_WEST,
|
||||||
SP_ARROW_NORTHWEST,
|
SP_ARROW_NORTHWEST,
|
||||||
|
SP_ARROW_FRIEND_NORTH,
|
||||||
|
SP_ARROW_FRIEND_NORTHEAST,
|
||||||
|
SP_ARROW_FRIEND_EAST,
|
||||||
|
SP_ARROW_FRIEND_SOUTHEAST,
|
||||||
|
SP_ARROW_FRIEND_SOUTH,
|
||||||
|
SP_ARROW_FRIEND_SOUTHWEST,
|
||||||
|
SP_ARROW_FRIEND_WEST,
|
||||||
|
SP_ARROW_FRIEND_NORTHWEST,
|
||||||
SP_TARGET,
|
SP_TARGET,
|
||||||
|
|
||||||
SP_MAX
|
SP_MAX
|
||||||
|
|
16
src/game.cpp
|
@ -1613,25 +1613,25 @@ static void game_doArrow(int i)
|
||||||
if (aliens[i].x + aliens[i].image[0]->w < 0)
|
if (aliens[i].x + aliens[i].image[0]->w < 0)
|
||||||
{
|
{
|
||||||
if (aliens[i].y + aliens[i].image[0]->h < 0)
|
if (aliens[i].y + aliens[i].image[0]->h < 0)
|
||||||
arrow = SP_ARROW_NORTHWEST;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_NORTHWEST : SP_ARROW_NORTHWEST;
|
||||||
else if (aliens[i].y > screen->h)
|
else if (aliens[i].y > screen->h)
|
||||||
arrow = SP_ARROW_SOUTHWEST;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_SOUTHWEST : SP_ARROW_SOUTHWEST;
|
||||||
else
|
else
|
||||||
arrow = SP_ARROW_WEST;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_WEST : SP_ARROW_WEST;
|
||||||
}
|
}
|
||||||
else if (aliens[i].x > screen->w)
|
else if (aliens[i].x > screen->w)
|
||||||
{
|
{
|
||||||
if (aliens[i].y + aliens[i].image[0]->h < 0)
|
if (aliens[i].y + aliens[i].image[0]->h < 0)
|
||||||
arrow = SP_ARROW_NORTHEAST;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_NORTHEAST : SP_ARROW_NORTHEAST;
|
||||||
else if (aliens[i].y > screen->h)
|
else if (aliens[i].y > screen->h)
|
||||||
arrow = SP_ARROW_SOUTHEAST;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_SOUTHEAST : SP_ARROW_SOUTHEAST;
|
||||||
else
|
else
|
||||||
arrow = SP_ARROW_EAST;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_EAST : SP_ARROW_EAST;
|
||||||
}
|
}
|
||||||
else if (aliens[i].y + aliens[i].image[0]->h < 0)
|
else if (aliens[i].y + aliens[i].image[0]->h < 0)
|
||||||
arrow = SP_ARROW_NORTH;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_NORTH : SP_ARROW_NORTH;
|
||||||
else if (aliens[i].y > screen->h)
|
else if (aliens[i].y > screen->h)
|
||||||
arrow = SP_ARROW_SOUTH;
|
arrow = (aliens[i].flags & FL_FRIEND) ? SP_ARROW_FRIEND_SOUTH : SP_ARROW_SOUTH;
|
||||||
|
|
||||||
if (arrow != -1)
|
if (arrow != -1)
|
||||||
{
|
{
|
||||||
|
|
|
@ -219,6 +219,14 @@ void loadGameGraphics()
|
||||||
gfx_sprites[SP_ARROW_SOUTHWEST] = gfx_loadImage("gfx/arrowSouthWest.png");
|
gfx_sprites[SP_ARROW_SOUTHWEST] = gfx_loadImage("gfx/arrowSouthWest.png");
|
||||||
gfx_sprites[SP_ARROW_WEST] = gfx_loadImage("gfx/arrowWest.png");
|
gfx_sprites[SP_ARROW_WEST] = gfx_loadImage("gfx/arrowWest.png");
|
||||||
gfx_sprites[SP_ARROW_NORTHWEST] = gfx_loadImage("gfx/arrowNorthWest.png");
|
gfx_sprites[SP_ARROW_NORTHWEST] = gfx_loadImage("gfx/arrowNorthWest.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_NORTH] = gfx_loadImage("gfx/friendArrowNorth.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_NORTHEAST] = gfx_loadImage("gfx/friendArrowNorthEast.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_EAST] = gfx_loadImage("gfx/friendArrowEast.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_SOUTHEAST] = gfx_loadImage("gfx/friendArrowSouthEast.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_SOUTH] = gfx_loadImage("gfx/friendArrowSouth.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_SOUTHWEST] = gfx_loadImage("gfx/friendArrowSouthWest.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_WEST] = gfx_loadImage("gfx/friendArrowWest.png");
|
||||||
|
gfx_sprites[SP_ARROW_FRIEND_NORTHWEST] = gfx_loadImage("gfx/friendArrowNorthWest.png");
|
||||||
gfx_sprites[SP_TARGET] = gfx_loadImage("gfx/targetText.png");
|
gfx_sprites[SP_TARGET] = gfx_loadImage("gfx/targetText.png");
|
||||||
gfx_sprites[SP_ESCAPE_POD] = gfx_loadImage("gfx/pod.png");
|
gfx_sprites[SP_ESCAPE_POD] = gfx_loadImage("gfx/pod.png");
|
||||||
gfx_sprites[SP_ORE] = gfx_loadImage("gfx/ore1.png");
|
gfx_sprites[SP_ORE] = gfx_loadImage("gfx/ore1.png");
|
||||||
|
|