Merge remote-tracking branch 'origin/master'

20 files changed, 40 insertions, 20 deletions

diff --git a/src/cat/LegacyLuaAPI.cpp b/src/cat/LegacyLuaAPI.cpp
index cb6fd9a..7eed062 100644
--- a/src/cat/LegacyLuaAPI.cpp
+++ b/src/cat/LegacyLuaAPI.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 #include <string>
 #include <iomanip>
 #include <vector>
@@ -1739,7 +1740,7 @@ int luatpt_message_box(lua_State* l)
 {
 	std::string title = std::string(luaL_optstring(l, 1, "Title"));
 	std::string message = std::string(luaL_optstring(l, 2, "Message"));
-	int large = luaL_optint(l, 3, 0);
+	int large = lua_toboolean(l, 3);
 	new InformationMessage(title, message, large);
 	return 0;
 }
@@ -1983,4 +1984,4 @@ int luatpt_screenshot(lua_State* l)
 	Client::Ref().WriteFile(data, filename.str());
 	return 0;
 }
-
+#endif
diff --git a/src/cat/LuaBit.cpp b/src/cat/LuaBit.cpp
index c55f45a..f1479d0 100644
--- a/src/cat/LuaBit.cpp
+++ b/src/cat/LuaBit.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 /*
 ** Lua BitOp -- a bit operations library for Lua 5.1/5.2.
 ** http://bitop.luajit.org/
@@ -189,4 +190,4 @@ int luaopen_bit(lua_State *L)
 #endif
   return 1;
 }
-
+#endif
diff --git a/src/cat/LuaButton.cpp b/src/cat/LuaButton.cpp
index 013adac..1b55f89 100644
--- a/src/cat/LuaButton.cpp
+++ b/src/cat/LuaButton.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -111,4 +112,5 @@ void LuaButton::triggerAction()
 
 LuaButton::~LuaButton()
 {
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaButton.h b/src/cat/LuaButton.h
index 012779d..69a77a4 100644
--- a/src/cat/LuaButton.h
+++ b/src/cat/LuaButton.h
@@ -30,4 +30,4 @@ public:
 
 	LuaButton(lua_State * l);
 	~LuaButton();
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaCheckbox.cpp b/src/cat/LuaCheckbox.cpp
index bac5c4e..55c39db 100644
--- a/src/cat/LuaCheckbox.cpp
+++ b/src/cat/LuaCheckbox.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -109,4 +110,5 @@ void LuaCheckbox::triggerAction()
 
 LuaCheckbox::~LuaCheckbox()
 {
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaCheckbox.h b/src/cat/LuaCheckbox.h
index 479cab2..0f2e8ad 100644
--- a/src/cat/LuaCheckbox.h
+++ b/src/cat/LuaCheckbox.h
@@ -30,4 +30,4 @@ public:
 
 	LuaCheckbox(lua_State * l);
 	~LuaCheckbox();
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaComponent.cpp b/src/cat/LuaComponent.cpp
index 75e7a21..028dfb5 100644
--- a/src/cat/LuaComponent.cpp
+++ b/src/cat/LuaComponent.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -79,4 +80,5 @@ LuaComponent::~LuaComponent()
 	if(component->GetParentWindow())
 		component->GetParentWindow()->RemoveComponent(component);
 	delete component;
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaComponent.h b/src/cat/LuaComponent.h
index 9e11b12..8e40890 100644
--- a/src/cat/LuaComponent.h
+++ b/src/cat/LuaComponent.h
@@ -30,4 +30,4 @@ public:
 	ui::Component * GetComponent() { return component; }
 	LuaComponent(lua_State * l);
 	~LuaComponent();
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaLabel.cpp b/src/cat/LuaLabel.cpp
index b08e687..4131918 100644
--- a/src/cat/LuaLabel.cpp
+++ b/src/cat/LuaLabel.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -52,4 +53,5 @@ int LuaLabel::text(lua_State * l)
 
 LuaLabel::~LuaLabel()
 {
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaLabel.h b/src/cat/LuaLabel.h
index a80ea4f..2653d9c 100644
--- a/src/cat/LuaLabel.h
+++ b/src/cat/LuaLabel.h
@@ -26,4 +26,4 @@ public:
 
 	LuaLabel(lua_State * l);
 	~LuaLabel();
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaLuna.h b/src/cat/LuaLuna.h
index 1d5d937..9fa4042 100644
--- a/src/cat/LuaLuna.h
+++ b/src/cat/LuaLuna.h
@@ -157,4 +157,4 @@ private:
 		lua_pushfstring(L, "%s (%s)", T::className, buff);
 		return 1;
 	}
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaProgressBar.cpp b/src/cat/LuaProgressBar.cpp
index 08c88ca..787cfcf 100644
--- a/src/cat/LuaProgressBar.cpp
+++ b/src/cat/LuaProgressBar.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -68,4 +69,5 @@ int LuaProgressBar::status(lua_State * l)
 
 LuaProgressBar::~LuaProgressBar()
 {
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaProgressBar.h b/src/cat/LuaProgressBar.h
index 9de56e7..a27ddee 100644
--- a/src/cat/LuaProgressBar.h
+++ b/src/cat/LuaProgressBar.h
@@ -27,4 +27,4 @@ public:
 
 	LuaProgressBar(lua_State * l);
 	~LuaProgressBar();
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp
index 4b2e749..09170a9 100644
--- a/src/cat/LuaScriptInterface.cpp
+++ b/src/cat/LuaScriptInterface.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 #include <string>
 #include <iomanip>
 #include <vector>
@@ -2201,3 +2202,4 @@ std::string LuaScriptInterface::FormatCommand(std::string command)
 LuaScriptInterface::~LuaScriptInterface() {
 	delete legacy;
 }
+#endif
diff --git a/src/cat/LuaSlider.cpp b/src/cat/LuaSlider.cpp
index ce07ebb..f8505d2 100644
--- a/src/cat/LuaSlider.cpp
+++ b/src/cat/LuaSlider.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -109,4 +110,5 @@ void LuaSlider::triggerOnValueChanged()
 
 LuaSlider::~LuaSlider()
 {
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaSlider.h b/src/cat/LuaSlider.h
index f9f327e..a1a97c4 100644
--- a/src/cat/LuaSlider.h
+++ b/src/cat/LuaSlider.h
@@ -30,4 +30,4 @@ public:
 
 	LuaSlider(lua_State * l);
 	~LuaSlider();
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaTextbox.cpp b/src/cat/LuaTextbox.cpp
index 5721525..89191a6 100644
--- a/src/cat/LuaTextbox.cpp
+++ b/src/cat/LuaTextbox.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -112,4 +113,5 @@ int LuaTextbox::text(lua_State * l)
 
 LuaTextbox::~LuaTextbox()
 {
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaTextbox.h b/src/cat/LuaTextbox.h
index 437875f..9a45f61 100644
--- a/src/cat/LuaTextbox.h
+++ b/src/cat/LuaTextbox.h
@@ -30,4 +30,4 @@ public:
 
 	LuaTextbox(lua_State * l);
 	~LuaTextbox();
-};
\ No newline at end of file
+};
diff --git a/src/cat/LuaWindow.cpp b/src/cat/LuaWindow.cpp
index d765d68..84e32e1 100644
--- a/src/cat/LuaWindow.cpp
+++ b/src/cat/LuaWindow.cpp
@@ -1,3 +1,4 @@
+#ifdef LUACONSOLE
 extern "C"
 {
 #include "lua.h"
@@ -590,4 +591,5 @@ LuaWindow::~LuaWindow()
 	if(ui::Engine::Ref().GetWindow() == window)
 		ui::Engine::Ref().CloseWindow();
 	delete window;
-}
\ No newline at end of file
+}
+#endif
diff --git a/src/cat/LuaWindow.h b/src/cat/LuaWindow.h
index f48c5f9..187b3dd 100644
--- a/src/cat/LuaWindow.h
+++ b/src/cat/LuaWindow.h
@@ -79,4 +79,4 @@ public:
 	ui::Window * GetWindow() { return window; }
 	LuaWindow(lua_State * l);
 	~LuaWindow();
-};
\ No newline at end of file
+};