C++ migration: Universe MUTEX_T replaced with std::mutex and std::atomic

1 files changed, 7 insertions, 8 deletions

diff --git a/src/universe.cpp b/src/universe.cpp
index 06c7313..4dd956d 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -43,11 +43,11 @@ static constexpr UniqueKey UNIVERSE_REGKEY{ 0x9f877b2cf078f17full };
 
 Universe* universe_create(lua_State* L)
 {
-    Universe* U = (Universe*) lua_newuserdatauv( L, sizeof(Universe), 0);                          // universe
-    memset( U, 0, sizeof( Universe));
+    Universe* const U = static_cast<Universe*>(lua_newuserdatauv(L, sizeof(Universe), 0));               // universe
+    U->Universe::Universe();
     STACK_CHECK_START_REL(L, 1);
     UNIVERSE_REGKEY.set_registry(L, [](lua_State* L) { lua_pushvalue(L, -2); });                   // universe
-    STACK_CHECK( L, 1);
+    STACK_CHECK(L, 1);
     return U;
 }
 
@@ -64,12 +64,11 @@ void universe_store(lua_State* L, Universe* U)
 
 Universe* universe_get(lua_State* L)
 {
-    Universe* universe;
-    STACK_GROW( L, 2);
+    STACK_GROW(L, 2);
     STACK_CHECK_START_REL(L, 0);
     UNIVERSE_REGKEY.query_registry(L);
-    universe = (Universe*) lua_touserdata( L, -1); // nullptr if nil
-    lua_pop( L, 1);
-    STACK_CHECK( L, 0);
+    Universe* const universe = static_cast<Universe*>(lua_touserdata(L, -1)); // nullptr if nil
+    lua_pop(L, 1);
+    STACK_CHECK(L, 0);
     return universe;
 }