Fixed a bunch of stuff
* 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:
parent
c789a8ddf5
commit
50e24fb75f
@ -1,8 +1,8 @@
|
||||
|
||||
// Minecart.cpp
|
||||
// Boat.cpp
|
||||
|
||||
// Implements the cMinecart class representing a minecart in the world
|
||||
// Indiana Jones!
|
||||
// Implements the cBoat class representing a boat in the world
|
||||
// Pirates of the Carribean!
|
||||
|
||||
#include "Globals.h"
|
||||
#include "Boat.h"
|
||||
|
@ -1,7 +1,7 @@
|
||||
|
||||
// Boat.h
|
||||
|
||||
// Declares the cBoat class representing a minecart in the world
|
||||
// Declares the cBoat class representing a boat in the world
|
||||
|
||||
|
||||
|
||||
|
@ -92,6 +92,7 @@ public:
|
||||
etMonster,
|
||||
etFallingBlock,
|
||||
etMinecart,
|
||||
etBoat,
|
||||
etTNT,
|
||||
etProjectile,
|
||||
|
||||
@ -119,6 +120,7 @@ public:
|
||||
bool IsPickup (void) const { return (m_EntityType == etPickup); }
|
||||
bool IsMob (void) const { return (m_EntityType == etMob); }
|
||||
bool IsMinecart(void) const { return (m_EntityType == etMinecart); }
|
||||
bool IsBoat (void) const { return (m_EntityType == etBoat); }
|
||||
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)
|
||||
|
@ -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 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 LoadMinecartRFromNBT (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);
|
||||
void LoadMinecartCFromNBT (cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx);
|
||||
|
Loading…
Reference in New Issue
Block a user