From 3e9f424c929fcf3a0e866f73b17ef05b8e95663e Mon Sep 17 00:00:00 2001 From: Andrew nuark G Date: Wed, 16 Dec 2020 00:24:15 +0700 Subject: [PATCH] Objects subsystem update --- system/object_system.cpp | 12 ++++++------ system/object_system.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/system/object_system.cpp b/system/object_system.cpp index cba284f..df59433 100644 --- a/system/object_system.cpp +++ b/system/object_system.cpp @@ -1,8 +1,8 @@ #include "object_system.h" -const dpoint_entity& object_system::get_dpoint(entity_id oid, bool &success) { - dpoint_entity *out; +const dpoint_entity* object_system::get_dpoint(entity_id oid, bool &success) { + dpoint_entity *out = nullptr; success = false; for (dpoint_entity &item : this->_dpoints) { @@ -13,7 +13,7 @@ const dpoint_entity& object_system::get_dpoint(entity_id oid, bool &success) { } } - return *out; + return out; } bool object_system::remove_dpoint(entity_id oid) { @@ -39,8 +39,8 @@ bool object_system::add_dpoint(dpoint_entity dpoint) { return false; } -const vessel_entity& object_system::get_vessel(entity_id oid, bool &success) { - vessel_entity *out; +const vessel_entity* object_system::get_vessel(entity_id oid, bool &success) { + vessel_entity *out = nullptr; success = false; for (vessel_entity &item : this->_vessels) { @@ -51,7 +51,7 @@ const vessel_entity& object_system::get_vessel(entity_id oid, bool &success) { } } - return *out; + return out; } bool object_system::remove_vessel(entity_id oid) { diff --git a/system/object_system.h b/system/object_system.h index d69d32a..9ee0f99 100644 --- a/system/object_system.h +++ b/system/object_system.h @@ -16,11 +16,11 @@ private: public: object_system() = default; - const dpoint_entity& get_dpoint(entity_id oid, bool &success); + const dpoint_entity* get_dpoint(entity_id oid, bool &success); bool remove_dpoint(entity_id oid); bool add_dpoint(dpoint_entity dpoint); - const vessel_entity& get_vessel(entity_id oid, bool &success); + const vessel_entity* get_vessel(entity_id oid, bool &success); bool remove_vessel(entity_id oid); bool add_vessel(vessel_entity dpoint);