mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge branch 'MaciekBaron-master'
This commit is contained in:
commit
a3b015e2a0
|
@ -110,7 +110,7 @@ int calculate_park_rating()
|
||||||
continue;
|
continue;
|
||||||
if (peep->happiness > 128)
|
if (peep->happiness > 128)
|
||||||
num_happy_peeps++;
|
num_happy_peeps++;
|
||||||
if (!(peep->var_C8 & 0x01))
|
if (!(peep->flags & PEEP_FLAGS_LEAVING_PARK))
|
||||||
continue;
|
continue;
|
||||||
if (peep->var_C6 <= 89)
|
if (peep->var_C6 <= 89)
|
||||||
_bp++;
|
_bp++;
|
||||||
|
|
33
src/peep.h
33
src/peep.h
|
@ -37,16 +37,11 @@ enum STAFF_TYPE {
|
||||||
STAFF_TYPE_ENTERTAINER
|
STAFF_TYPE_ENTERTAINER
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
|
||||||
PEEP_FLAGS_TRACKING = 8
|
|
||||||
};
|
|
||||||
|
|
||||||
enum PEEP_THOUGHT_TYPE {
|
enum PEEP_THOUGHT_TYPE {
|
||||||
PEEP_THOUGHT_TYPE_NONE = 255
|
PEEP_THOUGHT_TYPE_NONE = 255
|
||||||
};
|
};
|
||||||
|
|
||||||
enum PEEP_STATE {
|
enum PEEP_STATE {
|
||||||
|
|
||||||
PEEP_STATE_QUEUING_FRONT = 2,
|
PEEP_STATE_QUEUING_FRONT = 2,
|
||||||
PEEP_STATE_ON_RIDE = 3,
|
PEEP_STATE_ON_RIDE = 3,
|
||||||
PEEP_STATE_LEAVING_RIDE = 4,
|
PEEP_STATE_LEAVING_RIDE = 4,
|
||||||
|
@ -71,6 +66,32 @@ enum PEEP_STATE {
|
||||||
PEEP_STATE_INSPECTING = 23
|
PEEP_STATE_INSPECTING = 23
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum PEEP_FLAGS {
|
||||||
|
PEEP_FLAGS_LEAVING_PARK = (1 << 0),
|
||||||
|
PEEP_FLAGS_SLOW_WALK = (1 << 1),
|
||||||
|
|
||||||
|
PEEP_FLAGS_TRACKING = (1 << 3),
|
||||||
|
PEEP_FLAGS_WAVING = (1 << 4), // Makes the peep wave
|
||||||
|
|
||||||
|
PEEP_FLAGS_PHOTO = (1 << 6), // Makes the peep take a picture
|
||||||
|
PEEP_FLAGS_PAINTING = (1 << 7),
|
||||||
|
|
||||||
|
PEEP_FLAGS_LITTER = (1 << 9), // Makes the peep throw litter
|
||||||
|
PEEP_FLAGS_LOST = (1 << 10), // Makes the peep feel lost (animation trigerred)
|
||||||
|
PEEP_FLAGS_HUNGER = (1 << 11), // Makes the peep become hungry quicker
|
||||||
|
PEEP_FLAGS_BATHROOM = (1 << 12), // Makes the peep want to go to the bathroom
|
||||||
|
PEEP_FLAGS_CROWDED = (1 << 13), // The peep will start feeling crowded
|
||||||
|
|
||||||
|
PEEP_FLAGS_NAUSEA = (1 << 15), // Makes the peep feel sick (e.g. after an extreme ride)
|
||||||
|
|
||||||
|
PEEP_FLAGS_EATING = (1 << 17), // Reduces hunger
|
||||||
|
PEEP_FLAGS_EXPLODE = (1 << 18),
|
||||||
|
|
||||||
|
PEEP_FLAGS_JOY = (1 << 23), // Makes the peep jump in joy
|
||||||
|
PEEP_FLAGS_ANGRY = (1 << 24),
|
||||||
|
PEEP_FLAGS_ICE_CREAM = (1 << 25) // Unconfirmed
|
||||||
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint8 type;
|
uint8 type;
|
||||||
uint8 item;
|
uint8 item;
|
||||||
|
@ -132,7 +153,7 @@ typedef struct {
|
||||||
uint16 pad_C4;
|
uint16 pad_C4;
|
||||||
uint8 var_C6;
|
uint8 var_C6;
|
||||||
uint8 pad_C7;
|
uint8 pad_C7;
|
||||||
uint32 var_C8; // Bit 25 Ice Cream, Bit 24 mad, Bit 3 tracking, Bit 0 leaving the park
|
uint32 flags; // 0xC8
|
||||||
uint8 var_CC;
|
uint8 var_CC;
|
||||||
uint8 pad_CD[0x17];
|
uint8 pad_CD[0x17];
|
||||||
uint16 paid_to_enter; // 0xE4
|
uint16 paid_to_enter; // 0xE4
|
||||||
|
|
Loading…
Reference in New Issue