summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-06-13 04:50:02 +0200
committerarchshift <admin@archshift.com>2014-06-17 20:39:21 +0200
commit5b2b6e06150b6299d1e19374be092c0858b0e3a8 (patch)
tree0d8728e4ef91f35216924ba0fd8e13e9059d15f6 /src
parentCave spider now poisons its victim, added IsPawn function to Entity (diff)
downloadcuberite-5b2b6e06150b6299d1e19374be092c0858b0e3a8.tar
cuberite-5b2b6e06150b6299d1e19374be092c0858b0e3a8.tar.gz
cuberite-5b2b6e06150b6299d1e19374be092c0858b0e3a8.tar.bz2
cuberite-5b2b6e06150b6299d1e19374be092c0858b0e3a8.tar.lz
cuberite-5b2b6e06150b6299d1e19374be092c0858b0e3a8.tar.xz
cuberite-5b2b6e06150b6299d1e19374be092c0858b0e3a8.tar.zst
cuberite-5b2b6e06150b6299d1e19374be092c0858b0e3a8.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/Pawn.cpp4
-rw-r--r--src/Entities/Pawn.h4
-rw-r--r--src/Entities/Player.cpp4
-rw-r--r--src/Entities/Player.h2
-rw-r--r--src/Items/ItemPotion.h2
-rw-r--r--src/Mobs/Monster.cpp4
-rw-r--r--src/Mobs/Monster.h2
7 files changed, 12 insertions, 10 deletions
diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp
index 51ffc46b2..67b6fe4db 100644
--- a/src/Entities/Pawn.cpp
+++ b/src/Entities/Pawn.cpp
@@ -28,7 +28,7 @@ void cPawn::Tick(float a_Dt, cChunk & a_Chunk)
cEntityEffect &effect_values = iter->second;
// Apply entity effect
- HandleEntityEffects(effect_type, effect_values);
+ HandleEntityEffect(effect_type, effect_values);
// Reduce the effect's duration
effect_values.m_Ticks--;
@@ -106,7 +106,7 @@ void cPawn::ClearEntityEffects()
-void cPawn::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
+void cPawn::HandleEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
{
switch (a_EffectType)
{
diff --git a/src/Entities/Pawn.h b/src/Entities/Pawn.h
index 47fb691f4..2ffdd9fbb 100644
--- a/src/Entities/Pawn.h
+++ b/src/Entities/Pawn.h
@@ -23,6 +23,7 @@ public:
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
virtual void KilledBy(cEntity * a_Killer) override;
+ // tolua_begin
/** Applies an entity effect
* @param a_EffectType The entity effect to apply
* @param a_Effect The parameters of the effect
@@ -36,6 +37,7 @@ public:
/** Removes all currently applied entity effects (used when drinking milk) */
void ClearEntityEffects();
+ // tolua_end
protected:
typedef std::map<cEntityEffect::eType, cEntityEffect> tEffectMap;
@@ -45,7 +47,7 @@ protected:
* @param a_EffectType The selected entity effect
* @param a_Effect The parameters of the selected entity effect
*/
- virtual void HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect);
+ virtual void HandleEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect);
} ; // tolua_export
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 6bceab26f..5d8c3479b 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1867,7 +1867,7 @@ void cPlayer::TickBurning(cChunk & a_Chunk)
-void cPlayer::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
+void cPlayer::HandleEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
{
switch (a_EffectType)
{
@@ -1897,7 +1897,7 @@ void cPlayer::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffe
}
}
- super::HandleEntityEffects(a_EffectType, a_Effect);
+ super::HandleEntityEffect(a_EffectType, a_Effect);
}
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 3aba3289d..a793d3c30 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -522,7 +522,7 @@ protected:
virtual void TickBurning(cChunk & a_Chunk) override;
/** Called each tick to handle entity effects*/
- virtual void HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect) override;
+ virtual void HandleEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect) override;
/** Called in each tick to handle food-related processing */
void HandleFood(void);
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index 40748d71c..2c5760e34 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -128,7 +128,7 @@ public:
{
return false;
}
- if (!Projectile->Initialize(*a_World))
+ if (!Projectile->Initialize(a_World))
{
delete Projectile;
return false;
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index b8afbbc0c..4dfd81d88 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -436,7 +436,7 @@ void cMonster::HandleFalling()
-void cMonster::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
+void cMonster::HandleEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect)
{
switch (a_EffectType)
{
@@ -475,7 +475,7 @@ void cMonster::HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEff
}
}
- super::HandleEntityEffects(a_EffectType, a_Effect);
+ super::HandleEntityEffect(a_EffectType, a_Effect);
}
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index dbf95fbed..ca6cb0593 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -225,7 +225,7 @@ protected:
/* =========================== */
- virtual void HandleEntityEffects(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect) override;
+ virtual void HandleEntityEffect(cEntityEffect::eType a_EffectType, cEntityEffect a_Effect) override;
float m_IdleInterval;
float m_DestroyTimer;