From: <mg...@us...> - 2008-08-15 13:35:43
|
Revision: 2061 http://planeshift.svn.sourceforge.net/planeshift/?rev=2061&view=rev Author: mgist Date: 2008-08-15 13:35:52 +0000 (Fri, 15 Aug 2008) Log Message: ----------- - Fix for name change. Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2008-08-15 11:45:17 UTC (rev 2060) +++ trunk/src/server/entitymanager.cpp 2008-08-15 13:35:52 UTC (rev 2061) @@ -839,7 +839,7 @@ { meshfile.ReplaceAll("#", "/"); csString tmp; - tmp.Format("/planeshift/%s.spr", meshfile.GetData()); + tmp.Format("/planeshift/%s.meshfact", meshfile.GetData()); meshfile = tmp; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-25 20:25:27
|
Revision: 4256 http://planeshift.svn.sourceforge.net/planeshift/?rev=4256&view=rev Author: weltall2 Date: 2009-08-25 20:25:16 +0000 (Tue, 25 Aug 2009) Log Message: ----------- can someone explain me why kougaro has to move code in the wrong place? Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-08-25 19:55:08 UTC (rev 4255) +++ trunk/src/server/entitymanager.cpp 2009-08-25 20:25:16 UTC (rev 4256) @@ -1033,6 +1033,8 @@ return; } + client->SetTargetObject(object); // have special tracking for this for fast processing of other messages + if (!object) { // TODO: Evaluate if this output is needed. @@ -1040,8 +1042,6 @@ return; } - client->SetTargetObject(object); // have special tracking for this for fast processing of other messages - // Resolve default behaviour action = actionMsg.action; if (action == "dfltBehavior") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-31 13:29:30
|
Revision: 4285 http://planeshift.svn.sourceforge.net/planeshift/?rev=4285&view=rev Author: weltall2 Date: 2009-08-31 13:29:18 +0000 (Mon, 31 Aug 2009) Log Message: ----------- Fixed PS#2641 - Server is ready when no map is loaded Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-08-31 12:31:12 UTC (rev 4284) +++ trunk/src/server/entitymanager.cpp 2009-08-31 13:29:18 UTC (rev 4285) @@ -896,12 +896,15 @@ if (first) { - gameWorld->CreateMap( name, mapfile,psWorld::LOAD_NOW, false ); + if(!gameWorld->CreateMap( name, mapfile,psWorld::LOAD_NOW, false )) + return false; + first = false; } else { - gameWorld->NewRegion(mapfile,psWorld::LOAD_NOW, false); + if(!gameWorld->NewRegion(mapfile,psWorld::LOAD_NOW, false)) + return false; } return true; } @@ -915,15 +918,18 @@ csHash<gemObject*, EID>& gems = gem->GetAllGEMS(); csHash<gemObject*, EID>::GlobalIterator i(gems.GetIterator()); gemObject* obj; + + psserver->npcmanager->SendNPCList(client); while ( i.HasNext() ) { obj = i.Next(); // Send to superclient given by clientnum + //csSleep(50); obj->Send( me->clientnum, false, true ); } - psserver->npcmanager->SendNPCList(client); + //psserver->npcmanager->SendNPCList(client); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-18 11:32:47
|
Revision: 4427 http://planeshift.svn.sourceforge.net/planeshift/?rev=4427&view=rev Author: mgist Date: 2009-09-18 11:32:39 +0000 (Fri, 18 Sep 2009) Log Message: ----------- - Fix. Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-09-18 11:22:33 UTC (rev 4426) +++ trunk/src/server/entitymanager.cpp 2009-09-18 11:32:39 UTC (rev 4427) @@ -207,7 +207,7 @@ iSector* EntityManager::FindSector(const char * sectorname) { - return engine->GetSectors()->FindByName(sectorname); + return engine->GetSectors()->FindByName(csString(sectorname).Downcase()); } gemNPC* EntityManager::CreateFamiliar (gemActor *owner) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-09-27 22:06:46
|
Revision: 4577 http://planeshift.svn.sourceforge.net/planeshift/?rev=4577&view=rev Author: kougaro Date: 2009-09-27 22:06:38 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Sets back the velocity of the controlled actor when detaching entities, plus fix some warnings Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-09-27 18:24:26 UTC (rev 4576) +++ trunk/src/server/entitymanager.cpp 2009-09-27 22:06:38 UTC (rev 4577) @@ -908,7 +908,7 @@ { // the current message is full of entities, so send it and make another one allEntMsg->msg->ClipToCurrentSize(); - printf("Sending %d entities in %d bytes.\n", count-1, allEntMsg->msg->GetSize() ); + printf("Sending %d entities in %zu bytes.\n", count-1, allEntMsg->msg->GetSize() ); allEntMsg->SendMessage(); delete allEntMsg; count = 1; @@ -918,7 +918,7 @@ obj->Send(0, false, false, allEntMsg ); // this doesn't actually send but just appends to allEntMsg } allEntMsg->msg->ClipToCurrentSize(); - printf("Final send is %d entities in %d bytes.\n", count, allEntMsg->msg->GetSize() ); + printf("Final send is %d entities in %zu bytes.\n", count, allEntMsg->msg->GetSize() ); allEntMsg->SendMessage(); // This handles the final message with whatever entities are left. @@ -1148,19 +1148,13 @@ rider->SetMount(NULL); rider->UpdateProxList(true); - float movMod = rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier(); + float movMod = 1/(rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier()); if(movMod != 1.0) { psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::MULTIPLIER, csVector3(movMod), movMod); modMsg.SendMessage(); } - else - { - psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::NONE, - csVector3(0.0f), 0.0f); - modMsg.SendMessage(); - } } void EntityManager::SetReady(bool flag) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-09-30 12:59:50
|
Revision: 4589 http://planeshift.svn.sourceforge.net/planeshift/?rev=4589&view=rev Author: kougaro Date: 2009-09-30 12:59:41 +0000 (Wed, 30 Sep 2009) Log Message: ----------- change %zu to %lu in printf to avoid portability problems, thanks Kayden for the hint Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-09-29 20:19:48 UTC (rev 4588) +++ trunk/src/server/entitymanager.cpp 2009-09-30 12:59:41 UTC (rev 4589) @@ -908,7 +908,7 @@ { // the current message is full of entities, so send it and make another one allEntMsg->msg->ClipToCurrentSize(); - printf("Sending %d entities in %zu bytes.\n", count-1, allEntMsg->msg->GetSize() ); + printf("Sending %d entities in %lu bytes.\n", count-1, allEntMsg->msg->GetSize() ); allEntMsg->SendMessage(); delete allEntMsg; count = 1; @@ -918,7 +918,7 @@ obj->Send(0, false, false, allEntMsg ); // this doesn't actually send but just appends to allEntMsg } allEntMsg->msg->ClipToCurrentSize(); - printf("Final send is %d entities in %zu bytes.\n", count, allEntMsg->msg->GetSize() ); + printf("Final send is %d entities in %lu bytes.\n", count, allEntMsg->msg->GetSize() ); allEntMsg->SendMessage(); // This handles the final message with whatever entities are left. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-10-01 19:18:07
|
Revision: 4596 http://planeshift.svn.sourceforge.net/planeshift/?rev=4596&view=rev Author: Khakilord Date: 2009-10-01 19:17:55 +0000 (Thu, 01 Oct 2009) Log Message: ----------- Corrected r4589 by casting to unsigned long. Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-10-01 18:39:52 UTC (rev 4595) +++ trunk/src/server/entitymanager.cpp 2009-10-01 19:17:55 UTC (rev 4596) @@ -908,7 +908,7 @@ { // the current message is full of entities, so send it and make another one allEntMsg->msg->ClipToCurrentSize(); - printf("Sending %d entities in %lu bytes.\n", count-1, allEntMsg->msg->GetSize() ); + printf("Sending %d entities in %lu bytes.\n", count-1, static_cast<unsigned long>(allEntMsg->msg->GetSize()) ); allEntMsg->SendMessage(); delete allEntMsg; count = 1; @@ -918,7 +918,7 @@ obj->Send(0, false, false, allEntMsg ); // this doesn't actually send but just appends to allEntMsg } allEntMsg->msg->ClipToCurrentSize(); - printf("Final send is %d entities in %lu bytes.\n", count, allEntMsg->msg->GetSize() ); + printf("Final send is %d entities in %lu bytes.\n", count, static_cast<unsigned long>(allEntMsg->msg->GetSize()) ); allEntMsg->SendMessage(); // This handles the final message with whatever entities are left. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-10-02 14:00:32
|
Revision: 4607 http://planeshift.svn.sourceforge.net/planeshift/?rev=4607&view=rev Author: kougaro Date: 2009-10-02 14:00:08 +0000 (Fri, 02 Oct 2009) Log Message: ----------- Some cleanups to the code adding and remove relation between entities Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-10-02 10:25:41 UTC (rev 4606) +++ trunk/src/server/entitymanager.cpp 2009-10-02 14:00:08 UTC (rev 4607) @@ -1125,10 +1125,10 @@ rider->UpdateProxList(true); float movMod = mountChar->GetRaceInfo()->GetSpeedModifier(); - if(movMod != 1.0) + if( movMod != rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier()) { psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::MULTIPLIER, - csVector3(movMod), movMod); + csVector3(movMod), movMod); modMsg.SendMessage(); } @@ -1142,17 +1142,17 @@ psSectorInfo *sectorinfo; InstanceID instance; + float movMod = rider->GetMount()->GetRaceInfo()->GetSpeedModifier(); + rider->GetCharacterData()->GetLocationInWorld(instance, sectorinfo,pos.x,pos.y,pos.z,yrot); rider->GetMount()->SetLocationInWorld(instance, sectorinfo,pos.x,pos.y,pos.z,yrot); - CreateNPC(rider->GetMount(), instance, pos, FindSector(sectorinfo->name), yrot); + CreateNPC(rider->GetMount()); rider->SetMount(NULL); - rider->UpdateProxList(true); - float movMod = 1/(rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier()); - if(movMod != 1.0) + if( movMod != rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier()) { - psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::MULTIPLIER, - csVector3(movMod), movMod); + psMoveModMsg modMsg(rider->GetClientID(), psMoveModMsg::NONE, + csVector3(0), 0); modMsg.SendMessage(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-11-17 07:43:58
|
Revision: 4749 http://planeshift.svn.sourceforge.net/planeshift/?rev=4749&view=rev Author: weltall2 Date: 2009-11-17 07:43:48 +0000 (Tue, 17 Nov 2009) Log Message: ----------- fixed main player mesh not being resent to clients Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-11-17 01:37:36 UTC (rev 4748) +++ trunk/src/server/entitymanager.cpp 2009-11-17 07:43:48 UTC (rev 4749) @@ -1148,6 +1148,8 @@ rider->GetMount()->SetLocationInWorld(instance, sectorinfo,pos.x,pos.y,pos.z,yrot); CreateNPC(rider->GetMount()); rider->SetMount(NULL); + + rider->UpdateProxList( true ); if( movMod != rider->GetCharacterData()->GetRaceInfo()->GetSpeedModifier()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-12-07 10:14:18
|
Revision: 4897 http://planeshift.svn.sourceforge.net/planeshift/?rev=4897&view=rev Author: kennygraunke Date: 2009-12-07 10:14:11 +0000 (Mon, 07 Dec 2009) Log Message: ----------- Disable autostacking of nearby items, at least for now. According to Bovek, merchants like to arrange their wares on tables, and autostacking of similar items can end up averaging the qualities, which is not at all desirable. Similarly, people like to arrange food on tables. Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-12-06 23:45:13 UTC (rev 4896) +++ trunk/src/server/entitymanager.cpp 2009-12-07 10:14:11 UTC (rev 4897) @@ -813,6 +813,9 @@ if (isec==NULL) return NULL; + /* Apparently merchants like to arrange similar items on tables without + * them auto-stacking and thus averaging qualities. Similarly, people + * like to arrange food on tables, etc. Disabling at the request of Bovek. // Try to stack this first csArray<gemObject*> nearlist = gem->FindNearbyEntities( isec, newpos, RANGE_TO_STACK ); size_t count = nearlist.GetSize(); @@ -831,6 +834,7 @@ return nearitem->GetGemObject(); // Done } } + */ // Cannot stack, so make a new one // Get the mesh for this object This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-23 11:29:27
|
Revision: 5035 http://planeshift.svn.sourceforge.net/planeshift/?rev=5035&view=rev Author: weltall2 Date: 2009-12-23 11:29:18 +0000 (Wed, 23 Dec 2009) Log Message: ----------- show has quit only if the client has been ready Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2009-12-22 23:57:38 UTC (rev 5034) +++ trunk/src/server/entitymanager.cpp 2009-12-23 11:29:18 UTC (rev 5035) @@ -617,12 +617,17 @@ // take the actor off his mount if he got one if(actor->GetMount()) RemoveRideRelation(actor); + + //As we show the logged in status only when the client gets ready we check if it + //was ready before doing this + if(client->IsReady()) + { + // Check for buddy list members + usermanager->NotifyBuddies(client, UserManager::LOGGED_OFF); - // Check for buddy list members - usermanager->NotifyBuddies(client, UserManager::LOGGED_OFF); - - // Check for Guild members to notify - usermanager->NotifyGuildBuddies(client, UserManager::LOGGED_OFF); + // Check for Guild members to notify + usermanager->NotifyGuildBuddies(client, UserManager::LOGGED_OFF); + } // Any objects wanting to know when the actor is 'gone' are callback'd here. actor->Disconnect(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-12 14:23:31
|
Revision: 5528 http://planeshift.svn.sourceforge.net/planeshift/?rev=5528&view=rev Author: weltall2 Date: 2010-02-12 14:23:22 +0000 (Fri, 12 Feb 2010) Log Message: ----------- we don't create anymore familiar entries in the sc_npc_definition db Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2010-02-12 14:16:05 UTC (rev 5527) +++ trunk/src/server/entitymanager.cpp 2010-02-12 14:23:22 UTC (rev 5528) @@ -252,9 +252,6 @@ return NULL; } - // Prepare NPC client to the new npc - psserver->npcmanager->NewNPCNotify(familiarID, masterFamiliarID, owner->GetPID() ); - // Create Familiar using new ID this->CreateNPC( familiarID , false); //Do not update proxList, we will do that later. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-06-07 16:29:01
|
Revision: 7371 http://planeshift.svn.sourceforge.net/planeshift/?rev=7371&view=rev Author: weltall2 Date: 2011-06-07 16:28:55 +0000 (Tue, 07 Jun 2011) Log Message: ----------- moved setting after checking Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2011-06-07 15:54:14 UTC (rev 7370) +++ trunk/src/server/entitymanager.cpp 2011-06-07 16:28:55 UTC (rev 7371) @@ -568,14 +568,14 @@ instance,sector,pos,yrot, client->GetClientNum()); - client->SetActor(actor); - if (!actor || !actor->IsValid() ) { Error2("Error while creating gemActor for Character '%s'\n", chardata->GetCharName()); psserver->RemovePlayer (client->GetClientNum(),"The server could not create your character entity. (new gemActor() failed) Please contact tech support about this."); return false; } + + client->SetActor(actor); chardata->LoadActiveSpells(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2012-12-19 17:04:29
|
Revision: 8510 http://planeshift.svn.sourceforge.net/planeshift/?rev=8510&view=rev Author: magodra Date: 2012-12-19 17:04:23 +0000 (Wed, 19 Dec 2012) Log Message: ----------- - Use named constant instead of -1 to increase readability. Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2012-12-19 00:27:09 UTC (rev 8509) +++ trunk/src/server/entitymanager.cpp 2012-12-19 17:04:23 UTC (rev 8510) @@ -987,9 +987,9 @@ // First send the actor to the client actor->Send( me->clientnum, true, false ); - // Then send stuff like HP and mana to player, flags=-1 force a update of all stats + // Then send stuff like HP and mana to player psCharacter * chardata = client->GetCharacterData(); - chardata->SendStatDRMessage(me->clientnum, actor->GetEID(), -1); + chardata->SendStatDRMessage(me->clientnum, actor->GetEID(), DIRTY_VITAL_ALL); //Store info about the character login chardata->SetLastLoginTime(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2013-03-22 19:14:09
|
Revision: 8642 http://planeshift.svn.sourceforge.net/planeshift/?rev=8642&view=rev Author: weltall2 Date: 2013-03-22 19:14:02 +0000 (Fri, 22 Mar 2013) Log Message: ----------- forcefully set this. Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2013-03-22 16:41:53 UTC (rev 8641) +++ trunk/src/server/entitymanager.cpp 2013-03-22 19:14:02 UTC (rev 8642) @@ -599,6 +599,9 @@ } client->SetActor(actor); + + // Set the actor name to the client too. + client->SetName(chardata->GetCharName()); chardata->LoadActiveSpells(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-01-01 08:16:34
|
Revision: 9164 http://sourceforge.net/p/planeshift/code/9164 Author: ralphcampbell Date: 2014-01-01 08:16:28 +0000 (Wed, 01 Jan 2014) Log Message: ----------- Fix CID 1138894 by deleting allEntMsg Modified Paths: -------------- trunk/src/server/entitymanager.cpp Modified: trunk/src/server/entitymanager.cpp =================================================================== --- trunk/src/server/entitymanager.cpp 2014-01-01 07:20:14 UTC (rev 9163) +++ trunk/src/server/entitymanager.cpp 2014-01-01 08:16:28 UTC (rev 9164) @@ -1029,6 +1029,7 @@ Debug3(LOG_NET, client->GetClientNum(), "Final send is %d entities in %zu bytes.", count, allEntMsg->msg->GetSize()); allEntMsg->SendMessage(); // This handles the final message with whatever entities are left. + delete allEntMsg; // Tell superclient which entities he is managing this time psserver->npcmanager->SendNPCList(client); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |