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

Timestamp:

08/19/13 07:42:00 (12 years ago)

Author:

epyon

Message:

• lua - concept change - all functionality in nv::lua except raw
• lua - all modules made header-independent from raw (except obviously raw)

File:

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

trunk/src/lua/lua_map_area.cc

@@ -47 +47 @@
 // }
 
-bool nlua_is_map_area( lua_State* L, int index )
+bool nv::lua::detail::is_map_area( lua_State* L, int index )
 {
         return luaL_testudata( L, index, NLUA_MAP_AREA_METATABLE ) != 0;
 }
 
-nv::map_area* nlua_to_map_area( lua_State* L, int index )
+nv::map_area* nv::lua::detail::to_map_area( lua_State* L, int index )
 {
         if ( lua_type( L, index ) == LUA_TTABLE )
@@ -75 +75 @@
 }
 
-void nlua_push_map_area( lua_State* L, nv::map_area* c )
+using nv::lua::detail::is_map_area;
+using nv::lua::detail::to_map_area;
+using nv::lua::detail::push_map_area;
+
+using nv::lua::detail::is_coord;
+using nv::lua::detail::to_coord;
+using nv::lua::detail::to_pcoord;
+using nv::lua::detail::push_coord;
+
+using nv::lua::detail::is_area;
+using nv::lua::detail::to_area;
+using nv::lua::detail::to_parea;
+using nv::lua::detail::push_area;
+
+void nv::lua::detail::push_map_area( lua_State* L, nv::map_area* c )
 {
         nv::map_area** pm = (nv::map_area**) (lua_newuserdata(L, sizeof(nv::map_area*)));
@@ -91 +105 @@
 static int nlua_map_area_gc( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
+        nv::map_area* ma = to_map_area( L, 1 );
         if ( ma != nullptr )
         {
@@ -101 +115 @@
 static int nlua_map_area_get_area( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
+        nv::map_area* ma = to_map_area( L, 1 );
         nv::rectangle r  = ma->get_rectangle();
         r.lr.x -= 1;
         r.lr.y -= 1;
-        nlua_push_area( L, r );
+        push_area( L, r );
         return 1;
 }
@@ -111 +125 @@
 static int nlua_map_area_get_shift( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        nlua_push_coord( L, ma->get_shift() );
+        nv::map_area* ma = to_map_area( L, 1 );
+        push_coord( L, ma->get_shift() );
         return 1;
 }
@@ -118 +132 @@
 static int nlua_map_area_get_size( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        nlua_push_coord( L, ma->get_size() );
+        nv::map_area* ma = to_map_area( L, 1 );
+        push_coord( L, ma->get_size() );
         return 1;
 }
@@ -125 +139 @@
 static int nlua_map_area_get_cell( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        lua_pushstring( L, ma->id_to_string( ma->get_cell( nlua_to_coord( L, 2 ) ) ).c_str() );
+        nv::map_area* ma = to_map_area( L, 1 );
+        lua_pushstring( L, ma->id_to_string( ma->get_cell( to_coord( L, 2 ) ) ).c_str() );
         return 1;
 }
@@ -132 +146 @@
 static int nlua_map_area_set_cell( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        ma->set_cell( nlua_to_coord( L, 2 ), nlua_to_cell_id( L, 3, ma ) );
+        nv::map_area* ma = to_map_area( L, 1 );
+        ma->set_cell( to_coord( L, 2 ), nlua_to_cell_id( L, 3, ma ) );
         return 0;
 }
@@ -139 +153 @@
 static int nlua_map_area_raw_get_cell( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        lua_pushunsigned( L, ma->get_cell( nlua_to_coord( L, 2 ) ) );
+        nv::map_area* ma = to_map_area( L, 1 );
+        lua_pushunsigned( L, ma->get_cell( to_coord( L, 2 ) ) );
         return 1;
 }
@@ -146 +160 @@
 static int nlua_map_area_raw_set_cell( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        ma->set_cell( nlua_to_coord( L, 2 ), lua_tounsigned( L, 3 ) );
+        nv::map_area* ma = to_map_area( L, 1 );
+        ma->set_cell( to_coord( L, 2 ), lua_tounsigned( L, 3 ) );
         return 0;
 }
@@ -153 +167 @@
 static int nlua_map_area_index( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
+        nv::map_area* ma = to_map_area( L, 1 );
         if ( lua_type( L, 1 ) == LUA_TSTRING )
         {
@@ -162 +176 @@
         else
         {
-                lua_pushunsigned( L, ma->get_cell( nlua_to_coord( L, 2 ) ) );
+                lua_pushunsigned( L, ma->get_cell( to_coord( L, 2 ) ) );
         }
         return 1;
@@ -169 +183 @@
 static int nlua_map_area_newindex( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        ma->set_cell( nlua_to_coord( L, 2 ), lua_tounsigned( L, 3 ) );
+        nv::map_area* ma = to_map_area( L, 1 );
+        ma->set_cell( to_coord( L, 2 ), lua_tounsigned( L, 3 ) );
         return 0;
 }
@@ -176 +190 @@
 static int nlua_map_area_new_sub_area( lua_State* L )
 {
-        nv::map_area* ma = nlua_to_map_area( L, 1 );
-        nlua_push_map_area( L, ma->create_sub_area( nlua_to_area( L, 2 ) ) );
+        nv::map_area* ma = to_map_area( L, 1 );
+        push_map_area( L, ma->create_sub_area( to_area( L, 2 ) ) );
         return 1;
 }
@@ -212 +226 @@
 }
 
-void nlua_register_map_area_interface( lua_State* L, int index )
+void nv::lua::register_map_area_interface( lua_State* L, int index )
 {
         nlua_register( L, nlua_map_area_f, index );
 }
 
-void nlua_register_map_area( lua_State* L )
+void nv::lua::register_map_area( lua_State* L )
 {
         luaopen_map_area(L);