Merge pull request #87 from Xottab-DUTY/small_fixes

Small fixes
OpenXRay · Nov 21, 2015 · 7048f0a · 7048f0a
2 parents dc6def9 + e65e27b
commit 7048f0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/xrCore/Crypto/xr_dsa_signer.cpp b/src/xrCore/Crypto/xr_dsa_signer.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "xr_dsa_signer.h"
+#include <ctime>
 
 xr_dsa_signer::xr_dsa_signer(u8 const p_number[crypto::xr_dsa::public_key_length],
 							 u8 const q_number[crypto::xr_dsa::private_key_length],

diff --git a/src/xrGame/alife_monster_detail_path_manager_script.cpp b/src/xrGame/alife_monster_detail_path_manager_script.cpp
@@ -21,8 +21,8 @@ SCRIPT_EXPORT(CALifeMonsterDetailPathManager, (),
 			.def("target",		(void (CALifeMonsterDetailPathManager::*)(const GameGraph::_GRAPH_ID &, const u32 &, const Fvector &))(&CALifeMonsterDetailPathManager::target))
 			.def("target",		(void (CALifeMonsterDetailPathManager::*)(const GameGraph::_GRAPH_ID &))(&CALifeMonsterDetailPathManager::target))
 			.def("target",		(void (CALifeMonsterDetailPathManager::*)(const CALifeSmartTerrainTask *))(&CALifeMonsterDetailPathManager::target))
-			.def("speed	",		(void (CALifeMonsterDetailPathManager::*)(const float &))(&CALifeMonsterDetailPathManager::speed))
-			.def("speed	",		(const float &(CALifeMonsterDetailPathManager::*)() const)(&CALifeMonsterDetailPathManager::speed))
+			.def("speed",		(void (CALifeMonsterDetailPathManager::*)(const float &))(&CALifeMonsterDetailPathManager::speed))
+			.def("speed",		(const float &(CALifeMonsterDetailPathManager::*)() const)(&CALifeMonsterDetailPathManager::speed))
 			.def("completed",	&CALifeMonsterDetailPathManager::completed)
 			.def("actual",		&CALifeMonsterDetailPathManager::actual)
 			.def("failed",		&CALifeMonsterDetailPathManager::failed)

diff --git a/src/xrServerEntities/smart_cast_impl0.h b/src/xrServerEntities/smart_cast_impl0.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "object_type_traits.h"
+#include "Common/object_type_traits.h"
 
 namespace SmartDynamicCast {
 	template <typename T1, typename T2>