- added more LUA support and fixed parameter passing of Vec2i types with streflop

New LUA methods:
DisplayFormattedText
getAiEnabled
getHungerEnabled
startPerformanceTimer
endPerformanceTimer
getPerformanceTimerResults

source/shared_lib/include/lua/lua_script.h

@@ -0,0 +1,82 @@
+// ==============================================================
+//	This file is part of Glest Shared Library (www.glest.org)
+//
+//	Copyright (C) 2001-2008 Martio Figueroa
+//
+//	You can redistribute this code and/or modify it under 
+//	the terms of the GNU General Public License as published 
+//	by the Free Software Foundation; either version 2 of the 
+//	License, or (at your option) any later version
+// ==============================================================
+
+#ifndef _SHARED_LUA_LUASCRIPT_H_
+#define _SHARED_LUA_LUASCRIPT_H_
+
+#include <string>
+
+#include <lua.hpp>
+
+#include <vec.h>
+
+using std::string;
+
+using Shared::Graphics::Vec2i;
+
+namespace Shared{ namespace Lua{
+
+typedef lua_State LuaHandle;
+typedef int(*LuaFunction)(LuaHandle*);
+
+// =====================================================
+//	class LuaScript
+// =====================================================
+
+class LuaScript{
+private:
+	LuaHandle *luaState;
+	int argumentCount;
+
+public:
+	LuaScript();
+	~LuaScript();
+
+	void loadCode(const string &code, const string &name);
+
+	void beginCall(const string& functionName);
+	void endCall();
+
+	void registerFunction(LuaFunction luaFunction, const string &functionName);
+
+private:
+	string errorToString(int errorCode);
+};
+
+// =====================================================
+//	class LuaArguments
+// =====================================================
+
+class LuaArguments{
+private:
+	lua_State *luaState;
+	int returnCount;
+
+public:
+	LuaArguments(lua_State *luaState);
+
+	int getInt(int argumentIndex) const;
+	string getString(int argumentIndex) const;
+	void * getGenericData(int argumentIndex) const;
+	Vec2i getVec2i(int argumentIndex) const;
+	int getReturnCount() const					{return returnCount;}
+
+	void returnInt(int value);
+	void returnString(const string &value);
+	void returnVec2i(const Vec2i &value);
+
+private:
+	void throwLuaError(const string &message) const;
+};
+
+}}//end namespace
+
+#endif

source/shared_lib/sources/lua/lua_script.cpp

@@ -14,7 +14,7 @@
 #include <stdexcept>
 
 #include "conversion.h"
-
+#include "util.h"
 #include "leak_dumper.h"
 
 using namespace std;
@@ -83,6 +83,8 @@ void LuaScript::loadCode(const string &code, const string &name){
 void LuaScript::beginCall(const string& functionName){
 	Lua_STREFLOP_Wrapper streflopWrapper;
 
+	SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s Line: %d] functionName [%s]\n",__FILE__,__FUNCTION__,__LINE__,functionName.c_str());
+
 	lua_getglobal(luaState, functionName.c_str());
 	argumentCount= 0;
 }
@@ -93,7 +95,7 @@ void LuaScript::endCall(){
 	lua_pcall(luaState, argumentCount, 0, 0);
 }
 
-void LuaScript::registerFunction(LuaFunction luaFunction, const string &functionName){
+void LuaScript::registerFunction(LuaFunction luaFunction, const string &functionName) {
 	Lua_STREFLOP_Wrapper streflopWrapper;
 
 	lua_pushcfunction(luaState, luaFunction);
@@ -156,6 +158,30 @@ string LuaArguments::getString(int argumentIndex) const{
 	return luaL_checkstring(luaState, argumentIndex);
 }
 
+void * LuaArguments::getGenericData(int argumentIndex) const{
+	Lua_STREFLOP_Wrapper streflopWrapper;
+
+	if(lua_isstring(luaState, argumentIndex)) {
+		const char *result = luaL_checkstring(luaState, argumentIndex);
+		printf("\nGENERIC param %d is a string, %s!\n",argumentIndex,result);
+		return (void *)result;
+	}
+	//else if(lua_isnumber(luaState, argumentIndex)) {
+	//	double result = luaL_checknumber(luaState, argumentIndex);
+	//	printf("\nGENERIC param %d is a double, %f!\n",argumentIndex,result);
+	//	return (void *)result;
+	//}
+	else if(lua_isnumber(luaState, argumentIndex)) {
+		int result = luaL_checkinteger(luaState, argumentIndex);
+		printf("\nGENERIC param %d is an int, %d!\n",argumentIndex,result);
+		return (void *)result;
+	}
+	else {
+		printf("\nGENERIC param %d is a NULL!\n",argumentIndex);
+		return NULL;
+	}
+}
+
 Vec2i LuaArguments::getVec2i(int argumentIndex) const{
 	Lua_STREFLOP_Wrapper streflopWrapper;
 
@@ -195,7 +221,7 @@ void LuaArguments::returnString(const string &value){
 }
 
 void LuaArguments::returnVec2i(const Vec2i &value){
-	Lua_STREFLOP_Wrapper streflopWrapper;
+	//Lua_STREFLOP_Wrapper streflopWrapper;
 
 	++returnCount;