Browse Source

fixed 6 files out of 4258:

- removed 1210 CR characters
 - removed 17 trailing whitespaces
 - replaced 0 tabs with spaces
 - fixed 5 svn:eol-style properties
undefined
Lolbot Sam Hocevar <sam@hocevar.net> 10 years ago
parent
commit
0b111f1ece
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      doc/tutorial/14_lol_lua.cpp
  2. +1
    -1
      src/easymesh/easymeshlua.h
  3. +1
    -1
      src/lol/image/color.h

+ 2
- 2
doc/tutorial/14_lol_lua.cpp View File

@@ -128,7 +128,7 @@ public:
lua_pop(l, 2); lua_pop(l, 2);
vec3 t; vec3 t;
*/ */
//table = lua_isuserdata(l, -1); //table = lua_isuserdata(l, -1);
//Var<T> var(m_lua_state, -1); //Var<T> var(m_lua_state, -1);
//lua_pop(m_lua_state, 1); //lua_pop(m_lua_state, 1);
@@ -171,7 +171,7 @@ public:
DemoObject* loluademo_inst = demo_loader->GetPtr<DemoObject>("loluademo_inst"); DemoObject* loluademo_inst = demo_loader->GetPtr<DemoObject>("loluademo_inst");


Log::Info("Lua Vars: \ Log::Info("Lua Vars: \
testvalue_num: %.2f, testvalue_int: %i, testvalue_uint: %i, testvalue_str: %s.\n",
testvalue_num: %.2f, testvalue_int: %i, testvalue_uint: %i, testvalue_str: %s.\n",
testvalue_num, testvalue_int, testvalue_uint, testvalue_str.C()); testvalue_num, testvalue_int, testvalue_uint, testvalue_str.C());
Log::Info("Lua Vars: \ Log::Info("Lua Vars: \
function_return: %s, loluademo_return: %i, loluademo_inst_return: %.f, loluademo_getx: %i, loluademo_inst->m_x: %i.\n", function_return: %s, loluademo_return: %i, loluademo_inst_return: %.f, loluademo_getx: %i, loluademo_inst->m_x: %i.\n",


+ 1
- 1
src/easymesh/easymeshlua.h View File

@@ -22,7 +22,7 @@ public:
EasyMeshLuaLoader(); EasyMeshLuaLoader();
virtual ~EasyMeshLuaLoader(); virtual ~EasyMeshLuaLoader();
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class EasyMeshLuaObject : public LuaObjectDef class EasyMeshLuaObject : public LuaObjectDef
{ {


+ 1
- 1
src/lol/image/color.h View File

@@ -328,7 +328,7 @@ public:
* Convert hex strings to colors. * Convert hex strings to colors.
*/ */
static vec4 C8BppHexString(String c); static vec4 C8BppHexString(String c);
/* /*
* Some predefined colours * Some predefined colours
*/ */


Loading…
Cancel
Save