From 7e2f1113a4d6de8a7851c7a57fd7e5f0f58b8fa9 Mon Sep 17 00:00:00 2001
From: Martin Janiczek <martin@janiczek.cz>
Date: Mon, 17 Oct 2022 17:52:41 +0200
Subject: [PATCH] Refactor: use enum instead of magic numbers
---
src/actions.cc | 2 +-
src/animation.cc | 6 +++---
src/character_editor.cc | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/actions.cc b/src/actions.cc
index 8f202bf..1c4daab 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -1396,7 +1396,7 @@ int actionUseSkill(Object* a1, Object* a2, int skill)
return -1;
case SKILL_SNEAK:
- dudeToggleState(0);
+ dudeToggleState(DUDE_STATE_SNEAKING);
return 0;
default:
debugPrint("\nskill_use: invalid skill used.");
diff --git a/src/animation.cc b/src/animation.cc
index 36b27d2..7abcebb 100644
--- a/src/animation.cc
+++ b/src/animation.cc
@@ -690,7 +690,7 @@ int animationRegisterRunToObject(Object* owner, Object* destination, int actionP
animationDescription->destination = destination;
if ((FID_TYPE(owner->fid) == OBJ_TYPE_CRITTER && (owner->data.critter.combat.results & DAM_CRIP_LEG_ANY) != 0)
- || (owner == gDude && dudeHasState(0) && !perkGetRank(gDude, PERK_SILENT_RUNNING))
+ || (owner == gDude && dudeHasState(DUDE_STATE_SNEAKING) && !perkGetRank(gDude, PERK_SILENT_RUNNING))
|| !artExists(buildFid(FID_TYPE(owner->fid), owner->fid & 0xFFF, ANIM_RUNNING, 0, owner->rotation + 1))) {
animationDescription->anim = ANIM_WALK;
} else {
@@ -786,7 +786,7 @@ int animationRegisterRunToTile(Object* owner, int tile, int elevation, int actio
animationDescription->elevation = elevation;
if ((FID_TYPE(owner->fid) == OBJ_TYPE_CRITTER && (owner->data.critter.combat.results & DAM_CRIP_LEG_ANY) != 0)
- || (owner == gDude && dudeHasState(0) && !perkGetRank(gDude, PERK_SILENT_RUNNING))
+ || (owner == gDude && dudeHasState(DUDE_STATE_SNEAKING) && !perkGetRank(gDude, PERK_SILENT_RUNNING))
|| !artExists(buildFid(FID_TYPE(owner->fid), owner->fid & 0xFFF, ANIM_RUNNING, 0, owner->rotation + 1))) {
animationDescription->anim = ANIM_WALK;
} else {
@@ -3043,7 +3043,7 @@ int _dude_run(int a1)
}
if (!perkGetRank(gDude, PERK_SILENT_RUNNING)) {
- dudeDisableState(0);
+ dudeDisableState(DUDE_STATE_SNEAKING);
}
reg_anim_begin(ANIMATION_REQUEST_RESERVED);
diff --git a/src/character_editor.cc b/src/character_editor.cc
index eaac82f..f557852 100644
--- a/src/character_editor.cc
+++ b/src/character_editor.cc
@@ -1186,8 +1186,8 @@ int characterEditorShow(bool isCreationMode)
characterEditorRestorePlayer();
}
- if (dudeHasState(0x03)) {
- dudeDisableState(0x03);
+ if (dudeHasState(DUDE_STATE_LEVEL_UP_AVAILABLE)) {
+ dudeDisableState(DUDE_STATE_LEVEL_UP_AVAILABLE);
}
interfaceRenderHitPoints(false);