flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed a bunch of stuff

Browse Source 
* Fixed compilation
* Made it less obvious I COPIED ALL THE CODE from Minecarts
* Fixed alignment spaces to make xoft happy
This commit is contained in:
Tiger Wang 2013-09-08 16:56:16 +01:00
parent c789a8ddf5
commit 50e24fb75f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/Entities/Boat.cpp
View File

@ -1,8 +1,8 @@
// Minecart.cpp // Boat.cpp
// Implements the cMinecart class representing a minecart in the world // Implements the cBoat class representing a boat in the world
// Indiana Jones! // Pirates of the Carribean!
#include "Globals.h" #include "Globals.h"
#include "Boat.h" #include "Boat.h"

2
source/Entities/Boat.h
View File

@ -1,7 +1,7 @@
// Boat.h // Boat.h
// Declares the cBoat class representing a minecart in the world // Declares the cBoat class representing a boat in the world

2
source/Entities/Entity.h
View File

@ -92,6 +92,7 @@ public:
etMonster, etMonster,
etFallingBlock, etFallingBlock,
etMinecart, etMinecart,
etBoat,
etTNT, etTNT,
etProjectile, etProjectile,
@ -119,6 +120,7 @@ public:
bool IsPickup (void) const { return (m_EntityType == etPickup); } bool IsPickup (void) const { return (m_EntityType == etPickup); }
bool IsMob (void) const { return (m_EntityType == etMob); } bool IsMob (void) const { return (m_EntityType == etMob); }
bool IsMinecart(void) const { return (m_EntityType == etMinecart); } bool IsMinecart(void) const { return (m_EntityType == etMinecart); }
bool IsBoat (void) const { return (m_EntityType == etBoat); }
bool IsTNT (void) const { return (m_EntityType == etTNT); } bool IsTNT (void) const { return (m_EntityType == etTNT); }
/// Returns true if the entity is of the specified class or a subclass (cPawn's IsA("cEntity") returns true) /// Returns true if the entity is of the specified class or a subclass (cPawn's IsA("cEntity") returns true)

2
source/WorldStorage/WSSAnvil.h
View File

@ -138,7 +138,7 @@ protected:
void LoadEntityFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_EntityTagIdx, const char * a_IDTag, int a_IDTagLength); void LoadEntityFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_EntityTagIdx, const char * a_IDTag, int a_IDTagLength);
void LoadBoatFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIndx); void LoadBoatFromNBT (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIndx);
void LoadFallingBlockFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx); void LoadFallingBlockFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);
void LoadMinecartRFromNBT (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx); void LoadMinecartRFromNBT (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);
void LoadMinecartCFromNBT (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx); void LoadMinecartCFromNBT (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);