From c88dec51a998bd0051734f2c36f6c6cafb30b53e Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 22 Dec 2019 17:02:54 +1000
Subject: [PATCH] Introduce RACE constants

---
 src/game/chr/chr.c      | 32 ++++++++++++++++----------------
 src/include/constants.h |  5 +++++
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 08e3eef2c..4dc5be155 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -33075,9 +33075,9 @@ bool chrStartPath(struct chrdata *chr)
 
 bool chrTrySurrender(struct chrdata *chr)
 {
-	s32 race = chr ? chr->race : 0;
+	s32 race = chr ? chr->race : RACE_HUMAN;
 
-	if (race == 0 && func0f039a18(chr)) {
+	if (race == RACE_HUMAN && func0f039a18(chr)) {
 		chrSurrender(chr);
 		return true;
 	}
@@ -33270,9 +33270,9 @@ glabel func0f03aca0
 
 bool chrTryStop(struct chrdata *chr)
 {
-	s32 race = chr ? chr->race : 0;
+	s32 race = chr ? chr->race : RACE_HUMAN;
 
-	if (race == 3) {
+	if (race == RACE_ROBOT) {
 		func0f02e9a0(chr, 0);
 		return true;
 	}
@@ -33287,9 +33287,9 @@ bool chrTryStop(struct chrdata *chr)
 
 bool func0f03adf4(struct chrdata *chr)
 {
-	s32 race = chr ? chr->race : 0;
+	s32 race = chr ? chr->race : RACE_HUMAN;
 
-	if (race == 0 && func0f039a18(chr)) {
+	if (race == RACE_HUMAN && func0f039a18(chr)) {
 		func0f02f530(chr);
 		return true;
 	}
@@ -33299,9 +33299,9 @@ bool func0f03adf4(struct chrdata *chr)
 
 bool func0f03ae48(struct chrdata *chr)
 {
-	s32 race = chr ? chr->race : 0;
+	s32 race = chr ? chr->race : RACE_HUMAN;
 
-	if (race == 0 && func0f039a18(chr)) {
+	if (race == RACE_HUMAN && func0f039a18(chr)) {
 		func0f02f60c(chr);
 		return true;
 	}
@@ -33311,9 +33311,9 @@ bool func0f03ae48(struct chrdata *chr)
 
 bool func0f03ae9c(struct chrdata *chr)
 {
-	s32 race = chr ? chr->race : 0;
+	s32 race = chr ? chr->race : RACE_HUMAN;
 
-	if (race == 0 && func0f039a18(chr)) {
+	if (race == RACE_HUMAN && func0f039a18(chr)) {
 		func0f02f688(chr);
 		return true;
 	}
@@ -33323,9 +33323,9 @@ bool func0f03ae9c(struct chrdata *chr)
 
 bool chrTryKneel(struct chrdata *chr)
 {
-	s32 race = chr ? chr->race : 0;
+	s32 race = chr ? chr->race : RACE_HUMAN;
 
-	if (race == 0 && func0f039a18(chr)) {
+	if (race == RACE_HUMAN && func0f039a18(chr)) {
 		chrKneel(chr);
 		return true;
 	}
@@ -33779,9 +33779,9 @@ glabel func0f03b1e0
 
 bool func0f03b5f0(struct chrdata *chr, s32 pad_id)
 {
-	s32 race = chr ? chr->race : 0;
+	s32 race = chr ? chr->race : RACE_HUMAN;
 
-	if (race == 0 && func0f039a18(chr)) {
+	if (race == RACE_HUMAN && func0f039a18(chr)) {
 		pad_id = chrResolvePadId(chr, pad_id);
 
 		if (pad_id >= 0) {
@@ -47275,9 +47275,9 @@ glabel func0f0473cc
 bool func0f04767c(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4)
 {
 	if (chr && chr->actiontype != ACT_SKJUMP && func0f039a18(chr)) {
-		u8 race = chr ? chr->race : 0;
+		u8 race = chr ? chr->race : RACE_HUMAN;
 
-		if (race == 1) {
+		if (race == RACE_SKEDAR) {
 			return func0f047700(chr, arg1, arg2, arg3, arg4);
 		}
 	}
diff --git a/src/include/constants.h b/src/include/constants.h
index 54a1e1aad..4287dd0f1 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -637,6 +637,11 @@
 #define POSITIONTYPE_5      5
 #define POSITIONTYPE_PLAYER 6
 
+#define RACE_HUMAN  0
+#define RACE_SKEDAR 1
+#define RACE_MAIAN  2
+#define RACE_ROBOT  3
+
 #define SPEED_WALK 0
 #define SPEED_JOG  1
 #define SPEED_RUN  2