X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fenvironment.cpp;h=d9f24ede90aad05e7e5683fb09a4a30cffe41a82;hb=f97d4355beb79370d3bc69ea6baabb33ed90a8cd;hp=ff570554d919ae3e4b125a20ef6662f235be6ca8;hpb=061d4b420206c67fb346d75fb6bcaf4aa8147ca8;p=dragonfireclient.git diff --git a/src/environment.cpp b/src/environment.cpp index ff570554d..d9f24ede9 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -25,6 +25,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock.h" #include "serverobject.h" #include "content_sao.h" +#include "mapgen.h" +#include "settings.h" +#include "log.h" +#include "profiler.h" +#include "scriptapi.h" +#include "mapnode_contentfeatures.h" +#include "nodemetadata.h" + +#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")" Environment::Environment(): m_time_of_day(9000) @@ -261,9 +270,9 @@ void ActiveBlockList::update(core::list &active_positions, ServerEnvironment */ -ServerEnvironment::ServerEnvironment(ServerMap *map, Server *server): +ServerEnvironment::ServerEnvironment(ServerMap *map, lua_State *L): m_map(map), - m_server(server), + m_lua(L), m_random_spawn_timer(3), m_send_recommended_timer(0), m_game_time(0), @@ -300,7 +309,7 @@ void ServerEnvironment::serializePlayers(const std::string &savedir) // Full path to this file std::string path = players_path + "/" + player_files[i].name; - //dstream<<"Checking player file "<serialize(os); @@ -348,7 +357,7 @@ void ServerEnvironment::serializePlayers(const std::string &savedir) Player *player = *i; if(saved_players.find(player) != NULL) { - /*dstream<<"Player "<getName() + /*infostream<<"Player "<getName() <<" was already saved."<getName()<<" to " + /*infostream<<"Saving player "<getName()<<" to " <serialize(os); @@ -396,7 +405,7 @@ void ServerEnvironment::serializePlayers(const std::string &savedir) } } - //dstream<<"Saved "<deSerialize(is); @@ -476,7 +485,7 @@ void ServerEnvironment::saveMeta(const std::string &savedir) std::ofstream os(path.c_str(), std::ios_base::binary); if(os.good() == false) { - dstream<<"WARNING: ServerEnvironment::saveMeta(): Failed to open " + infostream<<"ServerEnvironment::saveMeta(): Failed to open " <setTimestamp(m_game_time); - //dstream<<"Block is "<m_node_metadata.step((float)dtime_s); + bool changed = block->m_node_metadata->step((float)dtime_s); if(changed) { MapEditEvent event; @@ -641,6 +650,108 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime) } } +void ServerEnvironment::clearAllObjects() +{ + infostream<<"ServerEnvironment::clearAllObjects(): " + <<"Removing all active objects"< objects_to_remove; + for(core::map::Iterator + i = m_active_objects.getIterator(); + i.atEnd()==false; i++) + { + ServerActiveObject* obj = i.getNode()->getValue(); + u16 id = i.getNode()->getKey(); + v3f objectpos = obj->getBasePosition(); + // Delete static object if block is loaded + if(obj->m_static_exists){ + MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block); + if(block){ + block->m_static_objects.remove(id); + block->raiseModified(MOD_STATE_WRITE_NEEDED); + obj->m_static_exists = false; + } + } + // If known by some client, don't delete immediately + if(obj->m_known_by_count > 0){ + obj->m_pending_deactivation = true; + obj->m_removed = true; + continue; + } + // Deregister in scripting api + scriptapi_rm_object_reference(m_lua, obj); + // Delete active object + delete obj; + // Id to be removed from m_active_objects + objects_to_remove.push_back(id); + } + // Remove references from m_active_objects + for(core::list::Iterator i = objects_to_remove.begin(); + i != objects_to_remove.end(); i++) + { + m_active_objects.remove(*i); + } + + core::list loadable_blocks; + infostream<<"ServerEnvironment::clearAllObjects(): " + <<"Listing all loadable blocks"<listAllLoadableBlocks(loadable_blocks); + infostream<<"ServerEnvironment::clearAllObjects(): " + <<"Done listing all loadable blocks: " + <::Iterator i = loadable_blocks.begin(); + i != loadable_blocks.end(); i++) + { + v3s16 p = *i; + MapBlock *block = m_map->emergeBlock(p, false); + if(!block){ + errorstream<<"ServerEnvironment::clearAllObjects(): " + <<"Failed to emerge block "<m_static_objects.m_stored.size(); + u32 num_active = block->m_static_objects.m_active.size(); + if(num_stored != 0 || num_active != 0){ + block->m_static_objects.m_stored.clear(); + block->m_static_objects.m_active.clear(); + block->raiseModified(MOD_STATE_WRITE_NEEDED); + num_objs_cleared += num_stored + num_active; + num_blocks_cleared++; + } + num_blocks_checked++; + + if(num_blocks_checked % report_interval == 0){ + float percent = 100.0 * (float)num_blocks_checked / + loadable_blocks.size(); + infostream<<"ServerEnvironment::clearAllObjects(): " + <<"Cleared "<getBool("footprints"); /* Increment game time @@ -663,38 +774,41 @@ void ServerEnvironment::step(float dtime) /* Handle players */ - for(core::list::Iterator i = m_players.begin(); - i != m_players.end(); i++) { - Player *player = *i; - - // Ignore disconnected players - if(player->peer_id == 0) - continue; - - v3f playerpos = player->getPosition(); - - // Move - player->move(dtime, *m_map, 100*BS); - - /* - Add footsteps to grass - */ - if(footprints) + ScopeProfiler sp(g_profiler, "SEnv: handle players avg", SPT_AVG); + for(core::list::Iterator i = m_players.begin(); + i != m_players.end(); i++) { - // Get node that is at BS/4 under player - v3s16 bottompos = floatToInt(playerpos + v3f(0,-BS/4,0), BS); - try{ - MapNode n = m_map->getNode(bottompos); - if(n.getContent() == CONTENT_GRASS) + Player *player = *i; + + // Ignore disconnected players + if(player->peer_id == 0) + continue; + + v3f playerpos = player->getPosition(); + + // Move + player->move(dtime, *m_map, 100*BS); + + /* + Add footsteps to grass + */ + if(footprints) + { + // Get node that is at BS/4 under player + v3s16 bottompos = floatToInt(playerpos + v3f(0,-BS/4,0), BS); + try{ + MapNode n = m_map->getNode(bottompos); + if(n.getContent() == CONTENT_GRASS) + { + n.setContent(CONTENT_GRASS_FOOTSTEPS); + m_map->setNode(bottompos, n); + } + } + catch(InvalidPositionException &e) { - n.setContent(CONTENT_GRASS_FOOTSTEPS); - m_map->setNode(bottompos, n); } } - catch(InvalidPositionException &e) - { - } } } @@ -703,6 +817,7 @@ void ServerEnvironment::step(float dtime) */ if(m_active_blocks_management_interval.step(dtime, 2.0)) { + ScopeProfiler sp(g_profiler, "SEnv: manage act. block list avg /2s", SPT_AVG); /* Get player block positions */ @@ -723,7 +838,7 @@ void ServerEnvironment::step(float dtime) /* Update list of active blocks, collecting changes */ - const s16 active_block_range = 5; + const s16 active_block_range = g_settings->getS16("active_block_range"); core::map blocks_removed; core::map blocks_added; m_active_blocks.update(players_blockpos, active_block_range, @@ -742,7 +857,7 @@ void ServerEnvironment::step(float dtime) { v3s16 p = i.getNode()->getKey(); - /*dstream<<"Server: Block ("<getBlockNoCreateNoEx(p); @@ -763,7 +878,7 @@ void ServerEnvironment::step(float dtime) { v3s16 p = i.getNode()->getKey(); - /*dstream<<"Server: Block ("<getBlockNoCreateNoEx(p); @@ -779,6 +894,8 @@ void ServerEnvironment::step(float dtime) */ if(m_active_blocks_nodemetadata_interval.step(dtime, 1.0)) { + ScopeProfiler sp(g_profiler, "SEnv: mess in act. blocks avg /1s", SPT_AVG); + float dtime = 1.0; for(core::map::Iterator @@ -787,7 +904,7 @@ void ServerEnvironment::step(float dtime) { v3s16 p = i.getNode()->getKey(); - /*dstream<<"Server: Block ("<getBlockNoCreateNoEx(p); @@ -801,7 +918,7 @@ void ServerEnvironment::step(float dtime) block->setTimestampNoChangedFlag(m_game_time); // Run node metadata - bool changed = block->m_node_metadata.step(dtime); + bool changed = block->m_node_metadata->step(dtime); if(changed) { MapEditEvent event; @@ -813,8 +930,10 @@ void ServerEnvironment::step(float dtime) } } } + if(m_active_blocks_test_interval.step(dtime, 10.0)) { + ScopeProfiler sp(g_profiler, "SEnv: modify in blocks avg /10s", SPT_AVG); //float dtime = 10.0; for(core::map::Iterator @@ -823,7 +942,7 @@ void ServerEnvironment::step(float dtime) { v3s16 p = i.getNode()->getKey(); - /*dstream<<"Server: Block ("<getBlockNoCreateNoEx(p); @@ -848,7 +967,7 @@ void ServerEnvironment::step(float dtime) // TODO: Implement usage of ActiveBlockModifier // Find out how many objects the block contains - u32 active_object_count = block->m_static_objects.m_active.size(); + //u32 active_object_count = block->m_static_objects.m_active.size(); // Find out how many objects this and all the neighbors contain u32 active_object_count_wider = 0; for(s16 x=-1; x<=1; x++) @@ -859,7 +978,18 @@ void ServerEnvironment::step(float dtime) if(block==NULL) continue; active_object_count_wider += - block->m_static_objects.m_active.size(); + block->m_static_objects.m_active.size() + + block->m_static_objects.m_stored.size(); + + /*if(block->m_static_objects.m_stored.size() != 0){ + errorstream<<"ServerEnvironment::step(): " + <getPos())<<" contains " + <m_static_objects.m_stored.size() + <<" stored objects; " + <<"when spawning objects, when counting active " + <<"objects in wide area. relative position: " + <<"("<getNodeNoEx(p1+v3s16(0,0,0)); + if(n1a.getLightBlend(getDayNightRatio()) <= 3){ + MapNode n1b = m_map->getNodeNoEx(p1+v3s16(0,1,0)); + if(n1a.getContent() == CONTENT_AIR && + n1b.getContent() == CONTENT_AIR) + { + v3f pos = intToFloat(p1, BS); + int i = myrand()%5; + if(i == 0 || i == 1){ + actionstream<<"A dungeon master spawns at " + < modified_blocks; + v3s16 tree_p = p; + ManualMapVoxelManipulator vmanip(m_map); + v3s16 tree_blockp = getNodeBlockPos(tree_p); + vmanip.initialEmerge(tree_blockp - v3s16(1,1,1), tree_blockp + v3s16(1,1,1)); + bool is_apple_tree = myrand()%4 == 0; + mapgen::make_tree(vmanip, tree_p, is_apple_tree); + vmanip.blitBackAll(&modified_blocks); + + // update lighting + core::map lighting_modified_blocks; + for(core::map::Iterator + i = modified_blocks.getIterator(); + i.atEnd() == false; i++) + { + lighting_modified_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue()); + } + m_map->updateLighting(lighting_modified_blocks, modified_blocks); + + // Send a MEET_OTHER event + MapEditEvent event; + event.type = MEET_OTHER; + for(core::map::Iterator + i = modified_blocks.getIterator(); + i.atEnd() == false; i++) + { + v3s16 p = i.getNode()->getKey(); + event.modified_blocks.insert(p, true); + } + m_map->dispatchEvent(&event); + } + } } } } + /* + Step script environment (run global on_step()) + */ + scriptapi_environment_step(m_lua, dtime); + /* Step active objects */ { + ScopeProfiler sp(g_profiler, "SEnv: step act. objs avg", SPT_AVG); //TimeTaker timer("Step active objects"); + + g_profiler->avg("SEnv: num of objects", m_active_objects.size()); // This helps the objects to send data at the same time bool send_recommended = false; m_send_recommended_timer += dtime; - if(m_send_recommended_timer > 0.15) + if(m_send_recommended_timer > getSendRecommendedInterval()) { - m_send_recommended_timer = 0; + m_send_recommended_timer -= getSendRecommendedInterval(); send_recommended = true; } @@ -947,6 +1171,11 @@ void ServerEnvironment::step(float dtime) i.atEnd()==false; i++) { ServerActiveObject* obj = i.getNode()->getValue(); + // Remove non-peaceful mobs on peaceful mode + if(g_settings->getBool("only_peaceful_mobs")){ + if(!obj->isPeaceful()) + obj->m_removed = true; + } // Don't step if is to be removed or stored statically if(obj->m_removed || obj->m_pending_deactivation) continue; @@ -966,19 +1195,20 @@ void ServerEnvironment::step(float dtime) */ if(m_object_management_interval.step(dtime, 0.5)) { + ScopeProfiler sp(g_profiler, "SEnv: remove removed objs avg /.5s", SPT_AVG); /* Remove objects that satisfy (m_removed && m_known_by_count==0) */ removeRemovedObjects(); } - if(g_settings.getBool("enable_experimental")) + if(g_settings->getBool("enable_experimental")) { /* TEST CODE */ -#if 1 +#if 0 m_random_spawn_timer -= dtime; if(m_random_spawn_timer < 0) { @@ -1000,7 +1230,7 @@ void ServerEnvironment::step(float dtime) pos = player->getPosition(); pos += v3f( myrand_range(-3,3)*BS, - 0, + 5, myrand_range(-3,3)*BS ); @@ -1008,11 +1238,18 @@ void ServerEnvironment::step(float dtime) Create a ServerActiveObject */ - //TestSAO *obj = new TestSAO(this, 0, pos); - //ServerActiveObject *obj = new ItemSAO(this, 0, pos, "CraftItem Stick 1"); - //ServerActiveObject *obj = new RatSAO(this, 0, pos); - //ServerActiveObject *obj = new Oerkki1SAO(this, 0, pos); - ServerActiveObject *obj = new FireflySAO(this, 0, pos); + //TestSAO *obj = new TestSAO(this, pos); + //ServerActiveObject *obj = new ItemSAO(this, pos, "CraftItem Stick 1"); + //ServerActiveObject *obj = new RatSAO(this, pos); + //ServerActiveObject *obj = new Oerkki1SAO(this, pos); + //ServerActiveObject *obj = new FireflySAO(this, pos); + + infostream<<"Server: Spawning MobV2SAO at " + <<"("<getBasePosition(); + + // The block in which the object resides in + v3s16 blockpos_o = getNodeBlockPos(floatToInt(objectpos, BS)); + + /* + Update the static data + */ + + // Create new static object + std::string staticdata = obj->getStaticData(); + StaticObject s_obj(obj->getType(), objectpos, staticdata); + // Add to the block where the object is located in + v3s16 blockpos = getNodeBlockPos(floatToInt(objectpos, BS)); + // Get or generate the block + MapBlock *block = m_map->emergeBlock(blockpos); + + bool succeeded = false; + + if(block) + { + block->m_static_objects.insert(0, s_obj); + block->raiseModified(MOD_STATE_WRITE_AT_UNLOAD); + succeeded = true; + } + else{ + infostream<<"ServerEnvironment::addActiveObjectAsStatic: " + <<"Could not find or generate " + <<"a block for storing static object"<m_removed == false) { f32 distance_f = object->getBasePosition().getDistanceFrom(pos_f); - /*dstream<<"removed == false" + /*infostream<<"removed == false" <<"distance_f = "<setId(new_id); } + else{ + verbosestream<<"ServerEnvironment::addActiveObjectRaw(): " + <<"supplied with id "<getId()<getId(), m_active_objects) == false) { - dstream<<"WARNING: ServerEnvironment::addActiveObjectRaw(): " + errorstream<<"ServerEnvironment::addActiveObjectRaw(): " <<"id is not free ("<getId()<<")"<getId(), object); - + + verbosestream<<"ServerEnvironment::addActiveObjectRaw(): " + <<"Added id="<getId()<<"; there are now " + <getBasePosition(); std::string staticdata = object->getStaticData(); @@ -1210,12 +1496,18 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object, object->m_static_block = blockpos; if(set_changed) - block->setChangedFlag(); + block->raiseModified(MOD_STATE_WRITE_NEEDED); } else{ - dstream<<"WARNING: ServerEnv: Could not find a block for " - <<"storing newly added static active object"<addedToEnvironment(object->getId()); return object->getId(); } @@ -1235,7 +1527,7 @@ void ServerEnvironment::removeRemovedObjects() // This shouldn't happen but check it if(obj == NULL) { - dstream<<"WARNING: NULL object found in ServerEnvironment" + infostream<<"NULL object found in ServerEnvironment" <<" while finding removed objects. id="<m_static_exists && obj->m_removed) { - MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block); + MapBlock *block = m_map->emergeBlock(obj->m_static_block); if(block) { block->m_static_objects.remove(id); - block->setChangedFlag(); + block->raiseModified(MOD_STATE_WRITE_NEEDED); + obj->m_static_exists = false; } } @@ -1266,6 +1559,9 @@ void ServerEnvironment::removeRemovedObjects() if(obj->m_known_by_count > 0) continue; + // Deregister in scripting api + scriptapi_rm_object_reference(m_lua, obj); + // Delete delete obj; // Id to be removed from m_active_objects @@ -1279,6 +1575,40 @@ void ServerEnvironment::removeRemovedObjects() } } +static void print_hexdump(std::ostream &o, const std::string &data) +{ + const int linelength = 16; + for(int l=0; ; l++){ + int i0 = linelength * l; + bool at_end = false; + int thislinelength = linelength; + if(i0 + thislinelength > (int)data.size()){ + thislinelength = data.size() - i0; + at_end = true; + } + for(int di=0; di= 32) + o<m_static_objects.m_stored.size() == 0) return; + verbosestream<<"ServerEnvironment::activateObjects(): " + <<"activating objects of block "<getPos()) + <<" ("<m_static_objects.m_stored.size() + <<" objects)"<m_static_objects.m_stored.size() > 49); + if(large_amount){ + errorstream<<"suspiciously large amount of objects detected: " + <m_static_objects.m_stored.size()<<" in " + <getPos()) + <<"; removing all of them."<m_static_objects.m_stored.clear(); + block->raiseModified(MOD_STATE_WRITE_NEEDED); + return; + } // A list for objects that couldn't be converted to static for some // reason. They will be stored back. core::list new_stored; @@ -1297,7 +1642,7 @@ void ServerEnvironment::activateObjects(MapBlock *block) i = block->m_static_objects.m_stored.begin(); i != block->m_static_objects.m_stored.end(); i++) { - /*dstream<<"INFO: Server: Creating an active object from " + /*infostream<<"Server: Creating an active object from " <<"static data"<m_pending_deactivation) + continue; + u16 id = i.getNode()->getKey(); v3f objectpos = obj->getBasePosition(); @@ -1365,69 +1727,120 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) if(m_active_blocks.contains(blockpos_o)) continue; + verbosestream<<"ServerEnvironment::deactivateFarObjects(): " + <<"deactivating object id="<m_known_by_count > 0 && !force_delete); + /* Update the static data */ + // Create new static object + std::string staticdata_new = obj->getStaticData(); + StaticObject s_obj(obj->getType(), objectpos, staticdata_new); + + bool stays_in_same_block = false; + bool data_changed = true; + + if(obj->m_static_exists){ + if(obj->m_static_block == blockpos_o) + stays_in_same_block = true; + + MapBlock *block = m_map->emergeBlock(obj->m_static_block, false); + + core::map::Node *n = + block->m_static_objects.m_active.find(id); + if(n){ + StaticObject static_old = n->getValue(); + + float save_movem = obj->getMinimumSavedMovement(); + + if(static_old.data == staticdata_new && + (static_old.pos - objectpos).getLength() < save_movem) + data_changed = false; + } else { + errorstream<<"ServerEnvironment::deactivateFarObjects(): " + <<"id="<m_static_block)<m_static_exists) { - MapBlock *block = m_map->getBlockNoCreateNoEx - (obj->m_static_block); + MapBlock *block = m_map->emergeBlock(obj->m_static_block, false); if(block) { block->m_static_objects.remove(id); - oldblock = block; + obj->m_static_exists = false; + // Only mark block as modified if data changed considerably + if(shall_be_written) + block->raiseModified(MOD_STATE_WRITE_NEEDED); } } - // Create new static object - std::string staticdata = obj->getStaticData(); - StaticObject s_obj(obj->getType(), objectpos, staticdata); + // Add to the block where the object is located in v3s16 blockpos = getNodeBlockPos(floatToInt(objectpos, BS)); // Get or generate the block MapBlock *block = m_map->emergeBlock(blockpos); - /*MapBlock *block = m_map->getBlockNoCreateNoEx(blockpos); - if(block == NULL) - { - // Block not found. Is the old block still ok? - if(oldblock) - block = oldblock; - // Load from disk or generate - else - block = m_map->emergeBlock(blockpos); - }*/ - if(block) { - block->m_static_objects.insert(0, s_obj); - block->setChangedFlag(); - obj->m_static_exists = true; - obj->m_static_block = block->getPos(); + if(block->m_static_objects.m_stored.size() >= 49){ + errorstream<<"ServerEnv: Trying to store id="<getId() + <<" statically but block "<m_static_objects.m_stored.size() + <<" (over 49) objects." + <<" Forcing delete."<m_static_objects.insert(new_id, s_obj); + + // Only mark block as modified if data changed considerably + if(shall_be_written) + block->raiseModified(MOD_STATE_WRITE_NEEDED); + + obj->m_static_exists = true; + obj->m_static_block = block->getPos(); + } } else{ - dstream<<"WARNING: ServerEnv: Could not find or generate " - <<"a block for storing static object"<m_static_exists = false; + errorstream<<"ServerEnv: Could not find or generate " + <<"a block for storing id="<getId() + <<" statically"<m_known_by_count > 0 && force_delete == false) + if(pending_delete) { + verbosestream<<"ServerEnvironment::deactivateFarObjects(): " + <<"object id="<m_pending_deactivation = true; continue; } - /*dstream<<"INFO: Server: Stored static data. Deleting object." - <getBool("free_move"); + bool footprints = g_settings->getBool("footprints"); // Get local player LocalPlayer *lplayer = getLocalPlayer(); @@ -1514,11 +1927,6 @@ void ClientEnvironment::step(float dtime) */ bool is_climbing = lplayer->is_climbing; - /* - Check if the player is frozen (don't apply physics) - */ - bool is_frozen = lplayer->is_frozen; - f32 player_speed = 0.001; // just some small value player_speed = lplayer->getSpeed().getLength(); @@ -1576,7 +1984,7 @@ void ClientEnvironment::step(float dtime) v3f lplayerpos = lplayer->getPosition(); // Apply physics - if(free_move == false && is_climbing == false && is_frozen == false) + if(free_move == false && is_climbing == false) { // Gravity v3f speed = lplayer->getSpeed(); @@ -1610,7 +2018,7 @@ void ClientEnvironment::step(float dtime) while(dtime_downcount > 0.001); //std::cout<<"Looped "<::Iterator i = player_collisions.begin(); i != player_collisions.end(); i++) @@ -1817,7 +2225,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object) u16 new_id = getFreeClientActiveObjectId(m_active_objects); if(new_id == 0) { - dstream<<"WARNING: ClientEnvironment::addActiveObject(): " + infostream<<"ClientEnvironment::addActiveObject(): " <<"no free ids available"<getId(), m_active_objects) == false) { - dstream<<"WARNING: ClientEnvironment::addActiveObject(): " + infostream<<"ClientEnvironment::addActiveObject(): " <<"id is not free ("<getId()<<")"<getId(), object); object->addToScene(m_smgr); @@ -1844,7 +2252,7 @@ void ClientEnvironment::addActiveObject(u16 id, u8 type, ClientActiveObject* obj = ClientActiveObject::create(type); if(obj == NULL) { - dstream<<"WARNING: ClientEnvironment::addActiveObject(): " + infostream<<"ClientEnvironment::addActiveObject(): " <<"id="<setId(id); - addActiveObject(obj); - obj->initialize(init_data); + + addActiveObject(obj); } void ClientEnvironment::removeActiveObject(u16 id) { - dstream<<"ClientEnvironment::removeActiveObject(): " + infostream<<"ClientEnvironment::removeActiveObject(): " <<"id="<