summaryrefslogtreecommitdiffstats
path: root/engine/object.cpp
diff options
context:
space:
mode:
authorancarola <raffaele.ancarola@epfl.ch>2019-01-22 23:52:04 +0100
committerancarola <raffaele.ancarola@epfl.ch>2019-01-22 23:52:04 +0100
commit23a4f6aa162cf42eae31cc6bb4486949f4aaafa7 (patch)
tree51f1abe2b3ab642784d30cd8682100e69d77d78f /engine/object.cpp
parentAdd include headers of libraries (diff)
downloadflatland-23a4f6aa162cf42eae31cc6bb4486949f4aaafa7.tar.gz
flatland-23a4f6aa162cf42eae31cc6bb4486949f4aaafa7.zip
Here we go
Diffstat (limited to 'engine/object.cpp')
-rw-r--r--engine/object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/object.cpp b/engine/object.cpp
index 990c403..b6a22fd 100644
--- a/engine/object.cpp
+++ b/engine/object.cpp
@@ -33,7 +33,7 @@ string object::random_id(uint8_t length) {
string out;
- for (Uint8 i = 0; i < length; ++i)
+ for (uint8_t i = 0; i < length; ++i)
out += (char)(rand() % 93 + 33);
return out;
@@ -54,7 +54,7 @@ vector<object*>& object::get_by_id(const string& id, vector<object*>& l)
{
for (object * obj : object::all_objects)
{
- if (id == obj->getID())
+ if (id == obj->get_id())
l.push_back(obj);
}