SWORD25: Get rid of Kernel::GetMicroTicks()

svn-id: r53403

4 files changed, 1 insertions, 22 deletions

diff --git a/engines/sword25/kernel/bs_stdint.h b/engines/sword25/kernel/bs_stdint.h
index c1970bff3e..360ac59436 100644
--- a/engines/sword25/kernel/bs_stdint.h
+++ b/engines/sword25/kernel/bs_stdint.h
@@ -39,13 +39,6 @@
 
 #include "common/scummsys.h"
 
-typedef uint8 uint8_t;
-typedef uint16 uint16_t;
-typedef uint32 uint32_t;
-typedef int8 int8_t;
-typedef int16 int16_t;
-typedef int32 int32_t;
-
 typedef unsigned long long uint64_t;
 typedef signed long long int64_t;
 typedef unsigned long long uint64;
diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp
index 3e7e7f125f..cccfc6ea53 100644
--- a/engines/sword25/kernel/kernel.cpp
+++ b/engines/sword25/kernel/kernel.cpp
@@ -362,14 +362,6 @@ uint Kernel::GetMilliTicks() {
 	return g_system->getMillis();
 }
 
-/**
- * Returns the elapsed time since the system start in microseconds.
- * This method should be used only if GetMilliTick() for the desired application is inaccurate.
- */
-uint64 Kernel::GetMicroTicks() {
-	return g_system->getMillis() * 1000;
-}
-
 // Other methods
 // -----------------
 
diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h
index 55a64c783f..6bc6f3de03 100644
--- a/engines/sword25/kernel/kernel.h
+++ b/engines/sword25/kernel/kernel.h
@@ -160,12 +160,6 @@ public:
 	uint GetMilliTicks();
 
 	/**
-	 * Returns the elapsed time since the system start in microseconds.
-	 * This method should be used only if GetMilliTick() for the desired application is inaccurate.
-	 */
-	uint64 GetMicroTicks();
-
-	/**
 	 * Specifies whether the kernel was successfully initialised
 	 */
 	bool GetInitSuccess() {
diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp
index 1b87dfdc6e..2f41660fb8 100644
--- a/engines/sword25/kernel/kernel_script.cpp
+++ b/engines/sword25/kernel/kernel_script.cpp
@@ -132,7 +132,7 @@ static int GetTimer(lua_State *L) {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
-	lua_pushnumber(L, static_cast<lua_Number>(pKernel->GetMicroTicks()) / 1000000.0);
+	lua_pushnumber(L, static_cast<lua_Number>(pKernel->GetMilliTicks()) / 1000.0);
 
 	return 1;
 }