uni-days/sea_transport_project
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Objects subsystem update

Browse source
This commit is contained in:
Andrew nuark G 2020-12-16 00:24:15 +07:00
parent 39935c4ecd
commit 3e9f424c92
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
system/object_system.cpp
View file

@ -1,8 +1,8 @@
#include "object_system.h" #include "object_system.h"
const dpoint_entity& object_system::get_dpoint(entity_id oid, bool &success) { const dpoint_entity* object_system::get_dpoint(entity_id oid, bool &success) {
dpoint_entity *out; dpoint_entity *out = nullptr;
success = false; success = false;
for (dpoint_entity &item : this->_dpoints) { 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) { bool object_system::remove_dpoint(entity_id oid) {
@ -39,8 +39,8 @@ bool object_system::add_dpoint(dpoint_entity dpoint) {
return false; return false;
} }
const vessel_entity& object_system::get_vessel(entity_id oid, bool &success) { const vessel_entity* object_system::get_vessel(entity_id oid, bool &success) {
vessel_entity *out; vessel_entity *out = nullptr;
success = false; success = false;
for (vessel_entity &item : this->_vessels) { 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) { bool object_system::remove_vessel(entity_id oid) {

4
system/object_system.h
View file

@ -16,11 +16,11 @@ private:
public: public:
object_system() = default; 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 remove_dpoint(entity_id oid);
bool add_dpoint(dpoint_entity dpoint); 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 remove_vessel(entity_id oid);
bool add_vessel(vessel_entity dpoint); bool add_vessel(vessel_entity dpoint);