Identify RACE constants

This commit is contained in:
Ryan Dwyer
2020-01-14 20:31:06 +10:00
parent 39bffa2d91
commit 944b1cc3b0
2 changed files with 7 additions and 7 deletions
+5 -5
View File
@@ -32392,12 +32392,12 @@ bool func0f03a578(struct chrdata *chr, s32 thingtype, s32 thingid)
{
s32 race = chr ? chr->race : RACE_HUMAN;
if (race == RACE_DRCAROLL || race == RACE_ROBOT) {
if (race == RACE_DRCAROLL || race == RACE_EYESPY) {
return false;
}
if (func0f039a18(chr)) {
if (race == RACE_4) {
if (race == RACE_ROBOT) {
func0f042808(chr);
return true;
}
@@ -32446,7 +32446,7 @@ bool func0f03a76c(struct chrdata *chr, u32 thingtype, s32 thingid)
{
s32 race = chr ? chr->race : RACE_HUMAN;
if (race == RACE_DRCAROLL || race == RACE_ROBOT) {
if (race == RACE_DRCAROLL || race == RACE_EYESPY) {
return false;
}
@@ -32759,7 +32759,7 @@ bool chrTryStop(struct chrdata *chr)
{
s32 race = chr ? chr->race : RACE_HUMAN;
if (race == RACE_ROBOT) {
if (race == RACE_EYESPY) {
func0f02e9a0(chr, 0);
return true;
}
@@ -37893,7 +37893,7 @@ void chrStopFiring(struct chrdata *chr)
{
u8 race = chr ? chr->race : RACE_HUMAN;
if (race != RACE_DRCAROLL && race != RACE_ROBOT && chr->unk2d4 == NULL) {
if (race != RACE_DRCAROLL && race != RACE_EYESPY && chr->unk2d4 == NULL) {
chrSetFiring(chr, 0, false);
chrSetFiring(chr, 1, false);
chrResetAimEndProperties(chr);
+2 -2
View File
@@ -773,8 +773,8 @@
#define RACE_HUMAN 0
#define RACE_SKEDAR 1
#define RACE_DRCAROLL 2
#define RACE_ROBOT 3
#define RACE_4 4
#define RACE_EYESPY 3
#define RACE_ROBOT 4
#define SAVEFILEFLAG_USED_TRANSFERPAK 0x23
#define SAVEFILEFLAG_CI_TOUR_DONE 0x24