slapin/streaming_world
1
0
Fork 0
Code Issues 32 Pull Requests Packages Projects 2 Releases Wiki Activity

Building removal works now

Browse Source
This commit is contained in:
Sergey Lapin
2024-09-08 19:28:21 +03:00
parent eac265642e
commit 41b46c9526
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/stream/stream.cpp
View File

@@ -342,8 +342,8 @@ void StreamWorld::request_item(int type, int item)
scenes[id].buildings.begin(); scenes[id].buildings.begin();
std::vector<int>::iterator e = std::vector<int>::iterator e =
scenes[id].buildings.end(); scenes[id].buildings.end();
if (item_nodes.has(item)) // if (item_nodes.has(item))
item_nodes[item]->queue_delete(); // item_nodes[item]->queue_delete();
scenes[id].buildings.erase(std::remove(b, e, item), scenes[id].buildings.erase(std::remove(b, e, item),
scenes[id].buildings.end()); scenes[id].buildings.end());
if (item_nodes.has(item)) { if (item_nodes.has(item)) {
@@ -390,6 +390,14 @@ void StreamWorld::remove_generated_stuff()
void StreamWorld::remove_building(int index) void StreamWorld::remove_building(int index)
{ {
// TODO: implement // TODO: implement
int i;
unload_building(index);
buildings.erase(buildings.begin() + index);
for (i = index; i < (int)buildings.size(); i++) {
item_nodes[i] = item_nodes[i + 1];
}
item_nodes.erase(buildings.size());
update_items();
} }
void StreamWorld::run_command(const String &command, const Array &args) void StreamWorld::run_command(const String &command, const Array &args)
@@ -498,9 +506,7 @@ void StreamWorld::run_command(const String &command, const Array &args)
return; return;
} }
int id = args[0]; int id = args[0];
unload_building(id); remove_building(id);
buildings.erase(buildings.begin() + id);
update_items();
} else if (command == "remove_generated_stuff") { } else if (command == "remove_generated_stuff") {
remove_generated_stuff(); remove_generated_stuff();
update_items(); update_items();