summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-04-02 15:54:57 +0200
committerTycho <work.tycho+git@gmail.com>2014-04-02 15:54:57 +0200
commitb449ad861310b6ec26a877835877730c8f11ad2c (patch)
treebd02fc5cbaceab7f7db1e24c95e78b22e6c39607 /src/Entities
parentMerge branch 'master' into globals (diff)
parentMore fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. (diff)
downloadcuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.gz
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.bz2
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.lz
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.xz
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.tar.zst
cuberite-b449ad861310b6ec26a877835877730c8f11ad2c.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Boat.cpp2
-rw-r--r--src/Entities/Effects.h2
-rw-r--r--src/Entities/ExpOrb.h2
-rw-r--r--src/Entities/Floater.h2
4 files changed, 3 insertions, 5 deletions
diff --git a/src/Entities/Boat.cpp b/src/Entities/Boat.cpp
index 94b24c5af..921252253 100644
--- a/src/Entities/Boat.cpp
+++ b/src/Entities/Boat.cpp
@@ -122,5 +122,3 @@ void cBoat::HandleSpeedFromAttachee(float a_Forward, float a_Sideways)
AddSpeed(ToAddSpeed);
}
-
- \ No newline at end of file
diff --git a/src/Entities/Effects.h b/src/Entities/Effects.h
index e7611847d..baf3302fb 100644
--- a/src/Entities/Effects.h
+++ b/src/Entities/Effects.h
@@ -27,4 +27,4 @@ enum ENUM_ENTITY_EFFECT
E_EFFECT_ABSORPTION = 22,
E_EFFECT_SATURATION = 23,
} ;
-// tolua_end \ No newline at end of file
+// tolua_end
diff --git a/src/Entities/ExpOrb.h b/src/Entities/ExpOrb.h
index c1150bd03..e76274ac9 100644
--- a/src/Entities/ExpOrb.h
+++ b/src/Entities/ExpOrb.h
@@ -42,4 +42,4 @@ protected:
/** The number of ticks that the entity has existed / timer between collect and destroy; in msec */
float m_Timer;
-} ; // tolua_export \ No newline at end of file
+} ; // tolua_export
diff --git a/src/Entities/Floater.h b/src/Entities/Floater.h
index f3b51d77b..547d503f1 100644
--- a/src/Entities/Floater.h
+++ b/src/Entities/Floater.h
@@ -43,4 +43,4 @@ protected:
// Entity IDs
int m_PlayerID;
int m_AttachedMobID;
-} ; // tolua_export \ No newline at end of file
+} ; // tolua_export