mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added some more sprites and changed get_guest_face to use them

This commit is contained in:
Duncan Frost 2014-05-12 21:06:02 +01:00
parent 9dd5e59f55
commit 72d9d17bf7
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/sprites.h
View File

@ -79,6 +79,22 @@ enum {
SPR_TAB_STATS_5 = SPR_TAB_STATS_0 + 5,
SPR_TAB_STATS_6 = SPR_TAB_STATS_0 + 6,
SPR_PEEP_LARGE_FACE_VERY_VERY_UNHAPPY = 5284,
SPR_PEEP_LARGE_FACE_VERY_UNHAPPY = 5285,
SPR_PEEP_LARGE_FACE_UNHAPPY = 5286,
SPR_PEEP_LARGE_FACE_NORMAL = 5287,
SPR_PEEP_LARGE_FACE_HAPPY = 5288,
SPR_PEEP_LARGE_FACE_VERY_HAPPY = 5289,
SPR_PEEP_LARGE_FACE_VERY_VERY_HAPPY = 5290,
SPR_PEEP_LARGE_FACE_TIRED = 5291,
SPR_PEEP_LARGE_FACE_VERY_TIRED = 5292,
SPR_PEEP_LARGE_FACE_SICK = 5293,
SPR_PEEP_LARGE_FACE_VERY_SICK = 5294,
SPR_PEEP_LARGE_FACE_VERY_VERY_SICK = 5298,
SPR_PEEP_LARGE_FACE_ANGRY = 5314,
SPR_TAB_SHOPS_AND_STALLS_0 = 5351,
SPR_TAB_SHOPS_AND_STALLS_1 = SPR_TAB_SHOPS_AND_STALLS_0 + 1,
SPR_TAB_SHOPS_AND_STALLS_2 = SPR_TAB_SHOPS_AND_STALLS_0 + 2,
@ -140,6 +156,20 @@ enum {
SPR_MOST_CONFUSING_LAYOUT = SPR_AWARD_MOST_UNTIDY + 15,
SPR_BEST_GENTLE_RIDES = SPR_AWARD_MOST_UNTIDY + 16,
SPR_PEEP_SMALL_FACE_VERY_VERY_UNHAPPY = 5486,
SPR_PEEP_SMALL_FACE_VERY_UNHAPPY = 5487,
SPR_PEEP_SMALL_FACE_UNHAPPY = 5488,
SPR_PEEP_SMALL_FACE_NORMAL = 5489,
SPR_PEEP_SMALL_FACE_HAPPY = 5490,
SPR_PEEP_SMALL_FACE_VERY_HAPPY = 5491,
SPR_PEEP_SMALL_FACE_VERY_VERY_HAPPY = 5492,
SPR_PEEP_SMALL_FACE_TIRED = 5493,
SPR_PEEP_SMALL_FACE_VERY_TIRED = 5494,
SPR_PEEP_SMALL_FACE_SICK = 5495,
SPR_PEEP_SMALL_FACE_VERY_SICK = 5496,
SPR_PEEP_SMALL_FACE_VERY_VERY_SICK = 5497,
SPR_PEEP_SMALL_FACE_ANGRY = 5498,
SPR_LAND_TOOL_DECREASE = 5499,
SPR_LAND_TOOL_INCREASE = 5501,

30
src/window_guest_list.c
View File

@ -935,26 +935,27 @@ static void window_guest_list_find_groups()
static int get_guest_face_sprite_small(rct_peep *peep)
{
int sprite;
sprite = 0x157A;
sprite = SPR_PEEP_SMALL_FACE_ANGRY;
if (peep->var_F3) return sprite;
sprite = SPR_PEEP_SMALL_FACE_VERY_VERY_SICK;
sprite = 0x1579;
if (peep->nausea > 200) return sprite;
sprite--;
sprite--; //VERY_SICK
if (peep->nausea > 170) return sprite;
sprite--;
sprite--; //SICK
if (peep->nausea > 140) return sprite;
sprite = 0x1576;
sprite = SPR_PEEP_SMALL_FACE_VERY_TIRED;
if (peep->energy < 46) return sprite;
sprite--;
sprite--; //TIRED
if (peep->energy < 70) return sprite;
sprite = 0x156E;
sprite = SPR_PEEP_SMALL_FACE_VERY_VERY_UNHAPPY;
//There are 7 different happiness based faces
for (int i = 37; peep->happiness >= i; i += 37)
{
sprite++;
@ -969,26 +970,27 @@ static int get_guest_face_sprite_small(rct_peep *peep)
*/
static int get_guest_face_sprite_large(rct_peep* peep){
int sprite;
sprite = 5314;
sprite = SPR_PEEP_LARGE_FACE_ANGRY;
if (peep->var_F3) return sprite;
sprite = SPR_PEEP_LARGE_FACE_VERY_VERY_SICK;
sprite = 5298;
if (peep->nausea > 200) return sprite;
sprite = 0x14AE;
sprite = SPR_PEEP_LARGE_FACE_VERY_SICK;
if (peep->nausea > 170) return sprite;
sprite = 0x14AD;
sprite = SPR_PEEP_LARGE_FACE_SICK;
if (peep->nausea > 140) return sprite;
sprite = 0x14AC;
sprite = SPR_PEEP_LARGE_FACE_VERY_TIRED;
if (peep->energy < 46) return sprite;
sprite--;
sprite--; //TIRED
if (peep->energy < 70) return sprite;
sprite = 0x14A4;
sprite = SPR_PEEP_LARGE_FACE_VERY_VERY_UNHAPPY;
//There are 7 different happiness based faces
for (int i = 37; peep->happiness >= i; i += 37)
{
sprite++;