summaryrefslogtreecommitdiffstats
path: root/source/Defines.h
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-07 14:36:30 +0100
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-07 14:36:30 +0100
commit787382caf8d3f7f8df4598b29586b44b7b071c53 (patch)
tree347e1249bbe371f820cf408d99549fb8734e0ac0 /source/Defines.h
parentNo need to reset zlib (copypasta error) (diff)
downloadcuberite-787382caf8d3f7f8df4598b29586b44b7b071c53.tar
cuberite-787382caf8d3f7f8df4598b29586b44b7b071c53.tar.gz
cuberite-787382caf8d3f7f8df4598b29586b44b7b071c53.tar.bz2
cuberite-787382caf8d3f7f8df4598b29586b44b7b071c53.tar.lz
cuberite-787382caf8d3f7f8df4598b29586b44b7b071c53.tar.xz
cuberite-787382caf8d3f7f8df4598b29586b44b7b071c53.tar.zst
cuberite-787382caf8d3f7f8df4598b29586b44b7b071c53.zip
Diffstat (limited to 'source/Defines.h')
-rw-r--r--source/Defines.h30
1 files changed, 23 insertions, 7 deletions
diff --git a/source/Defines.h b/source/Defines.h
index bd35ec3f4..5f49362b2 100644
--- a/source/Defines.h
+++ b/source/Defines.h
@@ -122,12 +122,12 @@ inline void AddDirection( int & a_X, unsigned char & a_Y, int & a_Z, char a_Dire
#define MAX(a,b) (((a)>(b))?(a):(b))
inline void EulerToVector( float a_Pan, float a_Pitch, float & a_X, float & a_Y, float & a_Z )
{
-// a_X = sinf ( a_Pan / 180 * PI ) * cosf ( a_Pitch / 180 * PI );
-// a_Y = -sinf ( a_Pitch / 180 * PI );
-// a_Z = -cosf ( a_Pan / 180 * PI ) * cosf ( a_Pitch / 180 * PI );
-a_X = cos(a_Pan / 180 * PI)*cos(a_Pitch / 180 * PI);
-a_Y = sin(a_Pan / 180 * PI)*cos(a_Pitch / 180 * PI);
-a_Z = sin(a_Pitch / 180 * PI);
+ // a_X = sinf ( a_Pan / 180 * PI ) * cosf ( a_Pitch / 180 * PI );
+ // a_Y = -sinf ( a_Pitch / 180 * PI );
+ // a_Z = -cosf ( a_Pan / 180 * PI ) * cosf ( a_Pitch / 180 * PI );
+ a_X = cos(a_Pan / 180 * PI)*cos(a_Pitch / 180 * PI);
+ a_Y = sin(a_Pan / 180 * PI)*cos(a_Pitch / 180 * PI);
+ a_Z = sin(a_Pitch / 180 * PI);
}
inline void VectorToEuler( float a_X, float a_Y, float a_Z, float & a_Pan, float & a_Pitch )
@@ -179,4 +179,20 @@ namespace ItemCategory
|| a_ItemID == E_ITEM_GOLD_SWORD
|| a_ItemID == E_ITEM_DIAMOND_SWORD;
}
-} \ No newline at end of file
+}
+
+//tolua_begin
+enum eGameMode
+{
+ eGameMode_Survival = 0,
+ eGameMode_Creative = 1,
+};
+
+enum eWeather
+{
+ eWeather_Sunny = 0,
+ eWeather_Rain = 1,
+ eWeather_ThunderStorm = 2,
+
+};
+//tolua_end \ No newline at end of file