From 951e6c76a7951a687c8efe5db5d264f4c9933846 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 10 Apr 2021 16:03:51 +0100 Subject: cPlayer: move some constants out of header --- src/Entities/Player.cpp | 12 ++++++++++-- src/Entities/Player.h | 8 -------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 1bfeea6e2..65fed943b 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -31,8 +31,9 @@ #include "../CraftingRecipes.h" -// 6000 ticks or 5 minutes -#define PLAYER_INVENTORY_SAVE_INTERVAL 6000 + + + namespace { @@ -62,6 +63,13 @@ const int cPlayer::MAX_FOOD_LEVEL = 20; // Number of ticks it takes to eat an item. #define EATING_TICKS 30_tick +// 6000 ticks or 5 minutes +#define PLAYER_INVENTORY_SAVE_INTERVAL 6000 + +#define XP_TO_LEVEL15 255 +#define XP_PER_LEVEL_TO15 17 +#define XP_TO_LEVEL30 825 + diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 7c8922dbf..3e35e4232 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -612,14 +612,6 @@ public: private: - /** Xp Level stuff */ - enum - { - XP_TO_LEVEL15 = 255, - XP_PER_LEVEL_TO15 = 17, - XP_TO_LEVEL30 = 825 - } ; - typedef std::vector > AStringVectorVector; /** The current body stance the player has adopted. */ -- cgit v1.2.3