no message

Quake/ls_common.h

@@ -23,12 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "lua.hpp"
 
-extern "C"
-{
-#include "q_stdinc.h"
-#include "cvar.h"
-}
-
 class LS_TempAllocatorBase
 {
 protected:
@@ -121,32 +115,20 @@ class LS_UserDataType : public LS_TypelessUserDataType
 	}
 };
 
+typedef struct cvar_s cvar_t;
+int LS_BoolCVarFunction(lua_State* state, cvar_t& cvar);
+int LS_NumberCVarFunction(lua_State* state, cvar_t& cvar);
+
 template <cvar_t& cvar>
 inline int LS_BoolCVarFunction(lua_State* state)
 {
-	if (lua_gettop(state) >= 1)
-	{
-		const int value = lua_toboolean(state, 1);
-		Cvar_SetValueQuick(&cvar, static_cast<float>(value));
-		return 0;
-	}
-
-	lua_pushboolean(state, static_cast<int>(cvar.value));
-	return 1;
+	return LS_BoolCVarFunction(state, cvar);
 }
 
 template <cvar_t& cvar>
 inline int LS_NumberCVarFunction(lua_State* state)
 {
-	if (lua_gettop(state) >= 1)
-	{
-		const float value = luaL_checknumber(state, 1);
-		Cvar_SetValueQuick(&cvar, value);
-		return 0;
-	}
-
-	lua_pushnumber(state, cvar.value);
-	return 1;
+	return LS_NumberCVarFunction(state, cvar);
 }
 
 void LS_InitEdictType(lua_State* state);

Quake/ls_main.cpp

@@ -185,6 +185,33 @@ void LS_TypelessUserDataType::SetMetaTable(lua_State* state, const luaL_Reg* mem
 }
 
 
+int LS_BoolCVarFunction(lua_State* state, cvar_t& cvar)
+{
+	if (lua_gettop(state) >= 1)
+	{
+		const int value = lua_toboolean(state, 1);
+		Cvar_SetValueQuick(&cvar, static_cast<float>(value));
+		return 0;
+	}
+
+	lua_pushboolean(state, static_cast<int>(cvar.value));
+	return 1;
+}
+
+int LS_NumberCVarFunction(lua_State* state, cvar_t& cvar)
+{
+	if (lua_gettop(state) >= 1)
+	{
+		const float value = luaL_checknumber(state, 1);
+		Cvar_SetValueQuick(&cvar, value);
+		return 0;
+	}
+
+	lua_pushnumber(state, cvar.value);
+	return 1;
+}
+
+
 //
 // Expose 'player' global table with corresponding helper functions
 //