From 36f7084e3fb4193676b14f302d0f961f2102e4ba Mon Sep 17 00:00:00 2001 From: "admin@omencraft.com" Date: Sun, 6 Nov 2011 09:23:20 +0000 Subject: Patch with diff file created by Sebi (implemented some stuff like lava physics, drops are deleted when in lava, water is now slower, lava gives actual damage etc.). Pistons now work mostly as they should. They do not yet show the motion animation and do not emit sound. They do extend, push, and retract as they should though. Right now the only way to activate a piston is to light redstone wire adjacent to it with a redstone torch. git-svn-id: http://mc-server.googlecode.com/svn/trunk@67 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cWorld.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/cWorld.h') diff --git a/source/cWorld.h b/source/cWorld.h index 10f73fae3..e8ad0f517 100644 --- a/source/cWorld.h +++ b/source/cWorld.h @@ -9,6 +9,7 @@ enum ENUM_ITEM_ID; #include class cWaterSimulator; +class cLavaSimulator; class cChunkMap; class cItem; class cCriticalSection; @@ -140,10 +141,12 @@ private: float m_LastSave; static float m_Time; // Time in seconds long long m_WorldTime; // Time in seconds*20, this is sent to clients (is wrapped) + unsigned long long CurrentTick; int m_GameMode; float m_WorldTimeFraction; // When this > 1.f m_WorldTime is incremented by 20 cWaterSimulator* m_WaterSimulator; + cLavaSimulator* m_LavaSimulator; cCriticalSection* m_ClientHandleCriticalSection; cCriticalSection* m_EntitiesCriticalSection; -- cgit v1.2.3