Problems with lambdas and references
This commit is contained in:
@@ -21,6 +21,21 @@
|
||||
*/
|
||||
#include "room_data.hpp"
|
||||
|
||||
RoomData::RoomData() {
|
||||
//
|
||||
}
|
||||
|
||||
RoomData::RoomData(RoomData& rhs) {
|
||||
roomName = std::move(rhs.roomName);
|
||||
tilesetName = std::move(rhs.tilesetName);
|
||||
pager = std::move(rhs.pager);
|
||||
//entityList = std::move(rhs.entityList);
|
||||
}
|
||||
|
||||
RoomData::~RoomData() {
|
||||
//
|
||||
}
|
||||
|
||||
std::string RoomData::SetRoomName(std::string s) {
|
||||
return roomName = s;
|
||||
}
|
||||
@@ -42,5 +57,5 @@ RegionPagerLua* RoomData::GetPager() {
|
||||
}
|
||||
|
||||
std::list<Entity*>* RoomData::GetEntityList() {
|
||||
return &entityList;
|
||||
// return &entityList;
|
||||
}
|
||||
@@ -36,8 +36,9 @@
|
||||
|
||||
class RoomData {
|
||||
public:
|
||||
RoomData() = default;
|
||||
~RoomData() = default;
|
||||
RoomData();
|
||||
RoomData(RoomData&);
|
||||
~RoomData();
|
||||
|
||||
//accessors and mutators
|
||||
std::string SetRoomName(std::string s);
|
||||
@@ -57,7 +58,7 @@ private:
|
||||
std::string tilesetName;
|
||||
|
||||
RegionPagerLua pager;
|
||||
std::list<Entity*> entityList;
|
||||
// std::list<Entity*> entityList;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -33,7 +33,8 @@
|
||||
int RoomManager::Create(std::string roomName) {
|
||||
std::cout << "Create-1" << std::endl;
|
||||
//create the room
|
||||
RoomData* newRoom = &elementMap[counter]; //implicitly constructs the element
|
||||
elementMap.emplace(counter); ////explicitly constructs the element
|
||||
RoomData* newRoom = &(elementMap.find(counter)->second);
|
||||
std::cout << "Create-2" << std::endl;
|
||||
newRoom->SetRoomName(roomName);
|
||||
std::cout << "Create-3" << std::endl;
|
||||
@@ -59,7 +60,7 @@ void RoomManager::UnloadAll() {
|
||||
elementMap.clear();
|
||||
}
|
||||
|
||||
void RoomManager::UnloadIf(std::function<bool(std::pair<const int,RoomData>)> fn) {
|
||||
void RoomManager::UnloadIf(std::function<bool(std::pair<const int,RoomData>&)> fn) {
|
||||
std::map<int, RoomData>::iterator it = elementMap.begin();
|
||||
while (it != elementMap.end()) {
|
||||
if (fn(*it)) {
|
||||
|
||||
@@ -42,7 +42,7 @@ public:
|
||||
void Unload(int uid) override;
|
||||
|
||||
void UnloadAll() override;
|
||||
void UnloadIf(std::function<bool(std::pair<const int,RoomData>)> fn) override;
|
||||
void UnloadIf(std::function<bool(std::pair<const int,RoomData>&)> fn) override;
|
||||
|
||||
//accessors and mutators
|
||||
RoomData* Get(int uid) override;
|
||||
|
||||
Reference in New Issue
Block a user