From efc2311f7ad1c929364b2929e35f71470e91b673 Mon Sep 17 00:00:00 2001 From: onpon4 Date: Fri, 8 Jan 2016 10:31:01 -0500 Subject: [PATCH] Added special indicators for Sid, Phoebe, and Ursula. --- LICENSES | 17 +++++++++++++++++ gfx/phoebeText.png | Bin 0 -> 334 bytes gfx/sidText.png | Bin 0 -> 263 bytes gfx/ursulaText.png | Bin 0 -> 323 bytes src/defs.h | 5 ++++- src/game.cpp | 10 ++++++++-- src/resources.cpp | 5 ++++- 7 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 gfx/phoebeText.png create mode 100644 gfx/sidText.png create mode 100644 gfx/ursulaText.png diff --git a/LICENSES b/LICENSES index fd72552..f725d70 100644 --- a/LICENSES +++ b/LICENSES @@ -61,6 +61,11 @@ gfx/targetText.png Author: Astrid S. de Wijn License: CC BY-SA 3.0 +Notes: + The text in these images was made by rendering the + DejaVu Sans Mono Bold font in the GIMP. smallFont.png uses size 13pt + with anti-aliasing off, while the other images use size 10pt with + anti-aliasing on. ------------------------------------------------------------------------ @@ -80,6 +85,18 @@ License: CC BY-SA 3.0 ------------------------------------------------------------------------ +gfx/phoebeText.png +gfx/sidText.png +gfx/ursulaText.png + +Author: onpon4 +License: CC0 +Notes: + Made by rendering the DejaVu Sans Mono Bold font in the GIMP at size + 10pt wih anti-aliasing on. + +------------------------------------------------------------------------ + gfx/face_chris.png gfx/face_phoebe.png gfx/face_sid.png diff --git a/gfx/phoebeText.png b/gfx/phoebeText.png new file mode 100644 index 0000000000000000000000000000000000000000..873f1f3bd148bb3e5d7fc37deaebaaf9a1e36c70 GIT binary patch literal 334 zcmV-U0kQsxP)u?(5RRVhL{X2Z+$*z-p-D< zN5Gji2lM@(^1Mzqjw7UL3c9XeQRKH~MNuTo^Zbe;zctHo9N{nwJKpm=XxkQC*Ck$- zWr*V#x~_vLia?Si(e z^lVuc0vbl15JS^61TwJZS@mUEvh<(LY?ftcZp$C`ec#ib=lSg+2)8j!)AH@2U+S>* z=gq$3=h$`DG|g>iaWtMcam=&otEyt@uQ#hG3L3`FV8LZ(X^es(p!uHTFtbh5fa5rC g^hdK_|Ka~ycR)u1dQD$iumAu607*qoM6N<$g8Rsr7XSbN literal 0 HcmV?d00001 diff --git a/gfx/sidText.png b/gfx/sidText.png new file mode 100644 index 0000000000000000000000000000000000000000..66790d816b9a8a7ca9e311f9976c460f9a07a1c0 GIT binary patch literal 263 zcmV+i0r>ujP)P000RH1^@s6$3KVo0002aNklPUJ6JS12Y0=NJO1lQpRBxoEb!6ErE2vm_k-P>id$z~yeZo*FT%(P&+mBYx6$`KHKu6_#@H_4 z7!rmdgb*mpQXOI#28yDZBgAnGilUq+ zD@oGIzp5&<^E^+>bEvZn!{AwxBvi8GW~(B@Fnleb>pJ9lj%U8_gDlH5vgBnpxlGf9 zq9|aRre}xgWWz8-XHgV!4T9jvoMFd_lx2yyZCk_~$8BQMG)2s^>|(3y8f}6g?ALk& zgd`H~x{j;_)8=gHM3!Y>7zWxc%Yvq9z;T>Stg5PHE?2K;+cx^UuDe_7@_+V>-T`b= V&ee(9aq<8F002ovPDHLkV1nK$mJk2{ literal 0 HcmV?d00001 diff --git a/src/defs.h b/src/defs.h index 59b179d..90a748a 100644 --- a/src/defs.h +++ b/src/defs.h @@ -375,7 +375,10 @@ enum { SP_ARROW_FRIEND_SOUTHWEST, SP_ARROW_FRIEND_WEST, SP_ARROW_FRIEND_NORTHWEST, - SP_TARGET, + SP_INDICATOR_TARGET, + SP_INDICATOR_SID, + SP_INDICATOR_PHOEBE, + SP_INDICATOR_URSULA, SP_MAX }; diff --git a/src/game.cpp b/src/game.cpp index af52f59..3410f36 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1641,8 +1641,14 @@ static void game_doArrow(int i) arrowY = MAX(0, MIN(arrowY, screen->h - gfx_sprites[arrow]->h)); screen_blit(gfx_sprites[arrow], arrowX, arrowY); - if (i == engine.targetIndex) - indicator = SP_TARGET; + if (i == ALIEN_SID) + indicator = SP_INDICATOR_SID; + else if (i == ALIEN_PHOEBE) + indicator = SP_INDICATOR_PHOEBE; + else if (i == ALIEN_URSULA) + indicator = SP_INDICATOR_URSULA; + else if (i == engine.targetIndex) + indicator = SP_INDICATOR_TARGET; if (indicator != -1) { diff --git a/src/resources.cpp b/src/resources.cpp index 21fcd7b..9cc7cdf 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -227,7 +227,10 @@ void loadGameGraphics() 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_INDICATOR_TARGET] = gfx_loadImage("gfx/targetText.png"); + gfx_sprites[SP_INDICATOR_SID] = gfx_loadImage("gfx/sidText.png"); + gfx_sprites[SP_INDICATOR_PHOEBE] = gfx_loadImage("gfx/phoebeText.png"); + gfx_sprites[SP_INDICATOR_URSULA] = gfx_loadImage("gfx/ursulaText.png"); gfx_sprites[SP_ESCAPE_POD] = gfx_loadImage("gfx/pod.png"); gfx_sprites[SP_ORE] = gfx_loadImage("gfx/ore1.png"); gfx_sprites[SP_ORE_2] = gfx_loadImage("gfx/ore2.png");