From dbbe72685926a2c6e10c71ab4dddc4b66f6a33fc Mon Sep 17 00:00:00 2001 From: Lendemor Date: Sun, 22 Jan 2017 01:14:36 +0100 Subject: [PATCH] fixed lua crash on wrong command --- src/sparrowshell/scriptnode.cpp | 2 +- src/sparrowshell/sparrowshell.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sparrowshell/scriptnode.cpp b/src/sparrowshell/scriptnode.cpp index 7640590..040d4fe 100644 --- a/src/sparrowshell/scriptnode.cpp +++ b/src/sparrowshell/scriptnode.cpp @@ -24,6 +24,6 @@ void ScriptNode::execute(std::string to_execute){ try{ s.script(to_execute); }catch(sol::error error_lua){ - std::cerr << error_lua.what() << std::endl; + this->getEngine().getShell()->out(error_lua.what(),glm::vec3(1,0,0)); } } diff --git a/src/sparrowshell/sparrowshell.cpp b/src/sparrowshell/sparrowshell.cpp index 86f09d6..67ab3a5 100644 --- a/src/sparrowshell/sparrowshell.cpp +++ b/src/sparrowshell/sparrowshell.cpp @@ -40,7 +40,7 @@ SparrowShell::SparrowShell(sf::Window* window): RESOURCE_ADD(fonte_des_neiges,Font,"shellfont"); //Create mesh for background - m_background = new BackGroundNode(glm::vec2(0),m_dimension,glm::vec3(0.1,0.1,0.1),0.5,SHELL_DEPTH,false); + m_background = new BackGroundNode(glm::vec2(0),m_dimension,glm::vec3(0.1,0.1,0.1),0.75,SHELL_DEPTH,false); //Create mesh for scrollbar m_scrollbar = new ShellScrollBar(this);