Changeset 198 for trunk/src/lua/lua_map_area.cc

Timestamp:

08/11/13 17:19:03 (12 years ago)

Author:

epyon

Message:

• warning cleanup for clang and gcc

File:

• trunk/src/lua/lua_map_area.cc (modified) (6 diffs)

trunk/src/lua/lua_map_area.cc

@@ -15 +15 @@
 typedef nv::flags<512> cell_set;
 
-nv::uint32 nlua_to_cell_id( lua_State* L, int index, nv::map_area* map )
+static nv::uint32 nlua_to_cell_id( lua_State* L, int index, nv::map_area* map )
 {
         if ( lua_type( L, index ) == LUA_TSTRING ) 
                 return map->string_to_id( lua_tostring( L, index ) );
         else
-                return (nv::uint32)lua_tointeger( L, index );
-}
-
-cell_set nlua_to_cell_set( lua_State* L, int index, nv::map_area* map )
-{
-        cell_set result;
-        switch ( lua_type( L, index ) )
-        {
-        case LUA_TTABLE :       
-                {
-                        lua_pushnil( L );
-                        while ( lua_next( L, index ) != 0 )
-                        {
-                                if ( lua_type( L, -1 ) == LUA_TSTRING )
-                                        result.set( map->string_to_id( lua_tostring( L, -1 ) ), true );
-                                else
-                                        result.set( lua_tointeger( L, -1 ), true );
-                                lua_pop( L, 1 );
-                        }
-                } break;
-        case LUA_TSTRING : result.set( map->string_to_id( lua_tostring( L, index ) ), true ); break;
-        case LUA_TNUMBER : result.set( lua_tointeger( L, index ), true ); break;
-        }
-        return result;
-}
+                return lua_tounsigned( L, index );
+}
+
+// static cell_set nlua_to_cell_set( lua_State* L, int index, nv::map_area* map )
+// {
+//      cell_set result;
+//      switch ( lua_type( L, index ) )
+//      {
+//      case LUA_TTABLE :       
+//              {
+//                      lua_pushnil( L );
+//                      while ( lua_next( L, index ) != 0 )
+//                      {
+//                              if ( lua_type( L, -1 ) == LUA_TSTRING )
+//                                      result.set( map->string_to_id( lua_tostring( L, -1 ) ), true );
+//                              else
+//                                      result.set( lua_tounsigned( L, -1 ), true );
+//                              lua_pop( L, 1 );
+//                      }
+//              } break;
+//      case LUA_TSTRING : result.set( map->string_to_id( lua_tostring( L, index ) ), true ); break;
+//      case LUA_TNUMBER : result.set( lua_tounsigned( L, index ), true ); break;
+//      }
+//      return result;
+// }
 
 bool nlua_is_map_area( lua_State* L, int index )
@@ -118 +118 @@
 {
         nv::map_area* ma = nlua_to_map_area( L, 1 );
-        lua_pushinteger( L, ma->get_cell( nlua_to_coord( L, 2 ) ) );
+        lua_pushunsigned( L, ma->get_cell( nlua_to_coord( L, 2 ) ) );
         return 1;
 }
@@ -125 +125 @@
 {
         nv::map_area* ma = nlua_to_map_area( L, 1 );
-        ma->set_cell( nlua_to_coord( L, 2 ), lua_tointeger( L, 3 ) );
+        ma->set_cell( nlua_to_coord( L, 2 ), lua_tounsigned( L, 3 ) );
         return 0;
 }
@@ -140 +140 @@
         else
         {
-                lua_pushinteger( L, ma->get_cell( nlua_to_coord( L, 2 ) ) );
+                lua_pushunsigned( L, ma->get_cell( nlua_to_coord( L, 2 ) ) );
         }
         return 1;
@@ -148 +148 @@
 {
         nv::map_area* ma = nlua_to_map_area( L, 1 );
-        ma->set_cell( nlua_to_coord( L, 2 ), lua_tointeger( L, 3 ) );
+        ma->set_cell( nlua_to_coord( L, 2 ), lua_tounsigned( L, 3 ) );
         return 0;
 }
@@ -179 +179 @@
 };
 
-int luaopen_map_area( lua_State * L )
+static int luaopen_map_area( lua_State * L )
 {
         luaL_newmetatable( L, NLUA_MAP_AREA_METATABLE );