X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fscripting%2Fsquirrel_util.hpp;h=aac6492f5e14670acaa904eff03780d9ea51ea82;hb=ce72d3661ad983b652e742baeb3bce2691b532aa;hp=2648b5f083a3ecf6200cb6de25f3ab15fff40eed;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git

diff --git a/src/scripting/squirrel_util.hpp b/src/scripting/squirrel_util.hpp
index 2648b5f08..aac6492f5 100644
--- a/src/scripting/squirrel_util.hpp
+++ b/src/scripting/squirrel_util.hpp
@@ -22,7 +22,7 @@
 #include "scripting/squirrel_error.hpp"
 #include "scripting/wrapper.hpp"
 
-namespace Scripting {
+namespace scripting {
 
 extern HSQUIRRELVM global_vm;
 
@@ -33,6 +33,8 @@ void update_debugger();
 std::string squirrel2string(HSQUIRRELVM vm, SQInteger i);
 void print_squirrel_stack(HSQUIRRELVM vm);
 
+SQInteger squirrel_read_char(SQUserPointer file);
+
 HSQOBJECT create_thread(HSQUIRRELVM vm);
 SQObject vm_to_object(HSQUIRRELVM vm);
 HSQUIRRELVM object_to_vm(HSQOBJECT object);
@@ -47,7 +49,7 @@ void expose_object(HSQUIRRELVM v, SQInteger table_idx, T* object,
                    const std::string& name, bool free = false)
 {
   sq_pushstring(v, name.c_str(), -1);
-  Scripting::create_squirrel_instance(v, object, free);
+  scripting::create_squirrel_instance(v, object, free);
 
   if(table_idx < 0)
     table_idx -= 2;
@@ -56,7 +58,7 @@ void expose_object(HSQUIRRELVM v, SQInteger table_idx, T* object,
   if(SQ_FAILED(sq_createslot(v, table_idx))) {
     std::ostringstream msg;
     msg << "Couldn't register object '" << name << "' in squirrel table";
-    throw Scripting::SquirrelError(v, msg.str());
+    throw scripting::SquirrelError(v, msg.str());
   }
 }
 
@@ -71,7 +73,7 @@ static inline void unexpose_object(HSQUIRRELVM v, SQInteger table_idx,
   if(SQ_FAILED(sq_deleteslot(v, table_idx, SQFalse))) {
     std::ostringstream msg;
     msg << "Couldn't unregister object '" << name << "' in squirrel root table";
-    throw Scripting::SquirrelError(v, msg.str());
+    throw scripting::SquirrelError(v, msg.str());
   }
 }