Changeset 383 for trunk/src/lua

Timestamp:

06/02/15 20:56:15 (10 years ago)

Author:

epyon

Message:

• more work on stl
• fully working vectors!
• copy & copy_n
• removal of a lot of std code!

Location:

trunk/src/lua

Files:

• lua_map_tile.cc (modified) (2 diffs)
• lua_raw.cc (modified) (1 diff)

trunk/src/lua/lua_map_tile.cc

@@ -118 +118 @@
                 new_tile->ascii = new nv::uchar8[ size ];
         }
-        std::copy( old_tile->data, old_tile->data + size, new_tile->data );
-        if ( old_tile->ascii ) std::copy( old_tile->ascii, old_tile->ascii + size, new_tile->ascii );
+        nv::raw_copy_n( old_tile->data, size, new_tile->data );
+        if ( old_tile->ascii ) nv::raw_copy_n( old_tile->ascii, size, new_tile->ascii );
 
         luaL_getmetatable( L, NLUA_MAP_TILE_METATABLE );
@@ -237 +237 @@
         map_tile* tile = nlua_to_pmap_tile( L, 1 );
         // assert( tile^.ascii == nullptr );
-        std::vector< nv::uint8 > sizes_x = nlua_tobytearray( L, 2 );
-        std::vector< nv::uint8 > sizes_y = ( lua_istable( L, 3 ) ? nlua_tobytearray( L, 3 ) : sizes_x );
+        nv::vector< nv::uint8 > sizes_x = nlua_tobytearray( L, 2 );
+        nv::vector< nv::uint8 > sizes_y;
+        if ( lua_istable( L, 3 ) )
+                sizes_y = nlua_tobytearray( L, 2 );
+        else
+                sizes_y.assign( sizes_x );
 
         nv::uint16 org_x = tile->size_x;

trunk/src/lua/lua_raw.cc

@@ -262 +262 @@
 }
 
-std::vector<nv::uint8> nlua_tobytearray( lua_State *L, int index )
-{
-        index = lua_absindex( L, index );
-        std::vector<nv::uint8> result;
+nv::vector<nv::uint8> nlua_tobytearray( lua_State *L, int index )
+{
+        index = lua_absindex( L, index );
+        nv::vector<nv::uint8> result;
         if ( lua_istable( L, index ) )
         {