فهرست منبع

Fixing bug where we double-delete a scene ptr.

Sam Jaffe 6 سال پیش
والد
کامیت
b4bc5d0d7c
2فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 1 1
      engine/include/game/engine/game_dispatch.hpp
  2. 2 2
      engine/src/game_dispatch.cpp

+ 1 - 1
engine/include/game/engine/game_dispatch.hpp

@@ -59,7 +59,7 @@ namespace engine {
     env::clock::timestamp current_timestamp;
     struct current_scene_info {
       current_scene_info();
-      current_scene_info(scene *);
+      current_scene_info(scene_t);
 
       scene_t ptr;
 

+ 2 - 2
engine/src/game_dispatch.cpp

@@ -40,7 +40,7 @@ namespace engine {
 
   void game_dispatch::activate_scene(scene_id_t const & id) {
     // TODO: Cleanup
-    curr_scene = current_scene_info(scenes[id].get());
+    curr_scene = current_scene_info(scenes[id]);
   }
 
   void game_dispatch::set_current_timestamp() {
@@ -49,7 +49,7 @@ namespace engine {
 
   game_dispatch::current_scene_info::current_scene_info() {}
 
-  game_dispatch::current_scene_info::current_scene_info(scene * curr)
+  game_dispatch::current_scene_info::current_scene_info(scene_t curr)
       : ptr(curr), current_scene_id(ptr->id), local_size(ptr->size()) {}
 
   graphics::manager const & game_dispatch::graphics_manager() const {