summaryrefslogtreecommitdiffstats
path: root/source/World.h
diff options
context:
space:
mode:
authormgueydan <gueydan.mathieuÃ@gmail.com>2013-09-08 02:47:02 +0200
committermgueydan <gueydan.mathieuÃ@gmail.com>2013-09-08 02:47:02 +0200
commit7a5e3592ffcc80f8c768ed2391b0ad521c59b67e (patch)
tree161f640fbd14bbe864996322f854e9dfc66b56d0 /source/World.h
parentDisabeling current mob spawning and tick (diff)
downloadcuberite-7a5e3592ffcc80f8c768ed2391b0ad521c59b67e.tar
cuberite-7a5e3592ffcc80f8c768ed2391b0ad521c59b67e.tar.gz
cuberite-7a5e3592ffcc80f8c768ed2391b0ad521c59b67e.tar.bz2
cuberite-7a5e3592ffcc80f8c768ed2391b0ad521c59b67e.tar.lz
cuberite-7a5e3592ffcc80f8c768ed2391b0ad521c59b67e.tar.xz
cuberite-7a5e3592ffcc80f8c768ed2391b0ad521c59b67e.tar.zst
cuberite-7a5e3592ffcc80f8c768ed2391b0ad521c59b67e.zip
Diffstat (limited to 'source/World.h')
-rw-r--r--source/World.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/World.h b/source/World.h
index eb19dce40..4590fb9c3 100644
--- a/source/World.h
+++ b/source/World.h
@@ -574,6 +574,7 @@ public:
/// Spawns a mob of the specified type. Returns the mob's EntityID if recognized and spawned, <0 otherwise
int SpawnMob(double a_PosX, double a_PosY, double a_PosZ, cMonster::eType a_MonsterType); // tolua_export
+ int SpawnMobFinalize(cMonster* a_Monster);
/// Creates a projectile of the specified type. Returns the projectile's EntityID if successful, <0 otherwise
int CreateProjectile(double a_PosX, double a_PosY, double a_PosZ, cProjectileEntity::eKind a_Kind, cEntity * a_Creator, const Vector3d * a_Speed = NULL); // tolua_export
@@ -626,7 +627,7 @@ private:
Int64 m_LastTimeUpdate; // The tick in which the last time update has been sent.
Int64 m_LastUnload; // The last WorldAge (in ticks) in which unloading was triggerred
Int64 m_LastSave; // The last WorldAge (in ticks) in which save-all was triggerred
- Int64 m_LastSpawnMonster; // The last WorldAge (in ticks) in which a monster was spawned
+ std::map<cMonster::eFamily,Int64> m_LastSpawnMonster; // The last WorldAge (in ticks) in which a monster was spawned (for each megatype of monster) // MG TODO : find a way to optimize without creating unmaintenability (if mob IDs are becoming unrowed)
eGameMode m_GameMode;
bool m_bEnabledPVP;
@@ -656,7 +657,7 @@ private:
cChunkMap * m_ChunkMap;
bool m_bAnimals;
- Int64 m_SpawnMonsterRate;
+ std::set<cMonster::eType> m_AllowedMobs;
eWeather m_Weather;
int m_WeatherInterval;