diff options
Diffstat (limited to 'Minecraft.World/Tile.h')
| -rw-r--r-- | Minecraft.World/Tile.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/Tile.h b/Minecraft.World/Tile.h index 142b32e6..307c4106 100644 --- a/Minecraft.World/Tile.h +++ b/Minecraft.World/Tile.h @@ -59,13 +59,13 @@ protected: ThreadStorage(); }; static DWORD tlsIdxShape; -public: +public: // Each new thread that needs to use Vec3 pools will need to call one of the following 2 functions, to either create its own // local storage, or share the default storage already allocated by the main thread static void CreateNewThreadStorage(); static void ReleaseThreadStorage(); -public: +public: static const int TILE_NUM_COUNT = 4096; static const int TILE_NUM_MASK = 0xfff; // 4096 - 1 static const int TILE_NUM_SHIFT = 12; // 4096 is 12 bits @@ -118,7 +118,7 @@ public: static SoundType *SOUND_NORMAL; static SoundType *SOUND_WOOD; static SoundType *SOUND_GRAVEL; - static SoundType *SOUND_GRASS; + static SoundType *SOUND_GRASS; static SoundType *SOUND_STONE; static SoundType *SOUND_METAL; static SoundType *SOUND_GLASS; @@ -704,7 +704,7 @@ public: virtual void playerWillDestroy(Level *level, int x, int y, int z, int data, shared_ptr<Player> player); virtual void onRemoving(Level *level, int x, int y, int z, int data); virtual void handleRain(Level *level, int x, int y, int z); - virtual void levelTimeChanged(Level *level, __int64 delta, __int64 newTime); + virtual void levelTimeChanged(Level *level, int64_t delta, int64_t newTime); virtual bool useOwnCloneData(); virtual bool canInstantlyTick(); virtual bool dropFromExplosion(Explosion *explosion); @@ -719,7 +719,7 @@ protected: public: virtual void registerIcons(IconRegister *iconRegister); - virtual wstring getTileItemIconName(); + virtual wstring getTileItemIconName(); // AP - added this function so we can generate the faceFlags for a block in a single fast function int getFaceFlags(LevelSource *level, int x, int y, int z); |