summaryrefslogtreecommitdiffstats
path: root/source/Player.h
diff options
context:
space:
mode:
authorJames Ravenscroft <ravenscroftj@gmail.com>2013-08-08 11:57:36 +0200
committerJames Ravenscroft <ravenscroftj@gmail.com>2013-08-08 11:57:36 +0200
commit9a6442a20652249248c8c631550718c314230ec7 (patch)
tree5edd56a2a2de24a981dd66485597fd41b28f3c11 /source/Player.h
parentMade player drowning implementation (diff)
downloadcuberite-9a6442a20652249248c8c631550718c314230ec7.tar
cuberite-9a6442a20652249248c8c631550718c314230ec7.tar.gz
cuberite-9a6442a20652249248c8c631550718c314230ec7.tar.bz2
cuberite-9a6442a20652249248c8c631550718c314230ec7.tar.lz
cuberite-9a6442a20652249248c8c631550718c314230ec7.tar.xz
cuberite-9a6442a20652249248c8c631550718c314230ec7.tar.zst
cuberite-9a6442a20652249248c8c631550718c314230ec7.zip
Diffstat (limited to 'source/Player.h')
-rw-r--r--source/Player.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/Player.h b/source/Player.h
index c0fe31863..f1d746318 100644
--- a/source/Player.h
+++ b/source/Player.h
@@ -29,8 +29,8 @@ public:
MAX_HEALTH = 20,
MAX_FOOD_LEVEL = 20,
EATING_TICKS = 30, ///< Number of ticks it takes to eat an item
- MAX_AIR_LEVEL = 300,
- DROWNING_TICKS = 10, //number of ticks per heart of damage
+ MAX_AIR_LEVEL = 300,
+ DROWNING_TICKS = 10, //number of ticks per heart of damage
} ;
// tolua_end
@@ -271,10 +271,10 @@ protected:
std::string m_PlayerName;
std::string m_LoadedWorldName;
- //Player's air level (for swimming)
- int m_AirLevel;
- //used to time ticks between damage taken via drowning/suffocation
- int m_AirTickTimer;
+ //Player's air level (for swimming)
+ int m_AirLevel;
+ //used to time ticks between damage taken via drowning/suffocation
+ int m_AirTickTimer;
bool m_bVisible;
@@ -346,8 +346,8 @@ protected:
/// Called in each tick to handle food-related processing
void HandleFood(void);
- /// Called in each tick to handle air-related processing i.e. drowning
- void HandleAir(cChunk & a_Chunk);
+ /// Called in each tick to handle air-related processing i.e. drowning
+ void HandleAir(cChunk & a_Chunk);
/// Adds food exhaustion based on the difference between Pos and LastPos, sprinting status and swimming (in water block)
void ApplyFoodExhaustionFromMovement(cChunk & a_Chunk);