diff options
author | Benoit Germain <benoit.germain@ubisoft.com> | 2024-03-21 15:41:54 +0100 |
---|---|---|
committer | Benoit Germain <benoit.germain@ubisoft.com> | 2024-03-21 15:41:54 +0100 |
commit | f0170ce8f1a90337637d387b87280f121d0578fe (patch) | |
tree | 32065aa3470b54e6058e5f47e4931171b7ec28f2 /src/universe.cpp | |
parent | 0b13436b835ea96ecdf930a380e9e5c8add8cb45 (diff) | |
download | lanes-f0170ce8f1a90337637d387b87280f121d0578fe.tar.gz lanes-f0170ce8f1a90337637d387b87280f121d0578fe.tar.bz2 lanes-f0170ce8f1a90337637d387b87280f121d0578fe.zip |
C++ migration: REGISTRY_SET and REGISTRY_GET are gone, welcome templates and lambdas
Diffstat (limited to 'src/universe.cpp')
-rw-r--r-- | src/universe.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/universe.cpp b/src/universe.cpp index d04a2f8..5d0d3b6 100644 --- a/src/universe.cpp +++ b/src/universe.cpp | |||
@@ -46,7 +46,7 @@ Universe* universe_create( lua_State* L) | |||
46 | Universe* U = (Universe*) lua_newuserdatauv( L, sizeof(Universe), 0); // universe | 46 | Universe* U = (Universe*) lua_newuserdatauv( L, sizeof(Universe), 0); // universe |
47 | memset( U, 0, sizeof( Universe)); | 47 | memset( U, 0, sizeof( Universe)); |
48 | STACK_CHECK( L, 1); | 48 | STACK_CHECK( L, 1); |
49 | REGISTRY_SET( L, UNIVERSE_REGKEY, lua_pushvalue(L, -2)); // universe | 49 | UNIVERSE_REGKEY.set_registry(L, [](lua_State* L) { lua_pushvalue(L, -2); }); // universe |
50 | STACK_END( L, 1); | 50 | STACK_END( L, 1); |
51 | return U; | 51 | return U; |
52 | } | 52 | } |
@@ -56,7 +56,7 @@ Universe* universe_create( lua_State* L) | |||
56 | void universe_store( lua_State* L, Universe* U) | 56 | void universe_store( lua_State* L, Universe* U) |
57 | { | 57 | { |
58 | STACK_CHECK( L, 0); | 58 | STACK_CHECK( L, 0); |
59 | REGISTRY_SET( L, UNIVERSE_REGKEY, (nullptr != U) ? lua_pushlightuserdata( L, U) : lua_pushnil( L)); | 59 | UNIVERSE_REGKEY.set_registry(L, [U](lua_State* L) { U ? lua_pushlightuserdata( L, U) : lua_pushnil( L); }); |
60 | STACK_END( L, 0); | 60 | STACK_END( L, 0); |
61 | } | 61 | } |
62 | 62 | ||
@@ -67,7 +67,7 @@ Universe* universe_get( lua_State* L) | |||
67 | Universe* universe; | 67 | Universe* universe; |
68 | STACK_GROW( L, 2); | 68 | STACK_GROW( L, 2); |
69 | STACK_CHECK( L, 0); | 69 | STACK_CHECK( L, 0); |
70 | REGISTRY_GET( L, UNIVERSE_REGKEY); | 70 | UNIVERSE_REGKEY.query_registry(L); |
71 | universe = (Universe*) lua_touserdata( L, -1); // nullptr if nil | 71 | universe = (Universe*) lua_touserdata( L, -1); // nullptr if nil |
72 | lua_pop( L, 1); | 72 | lua_pop( L, 1); |
73 | STACK_END( L, 0); | 73 | STACK_END( L, 0); |