From: <mg...@us...> - 2008-12-08 05:11:55
|
Revision: 2645 http://planeshift.svn.sourceforge.net/planeshift/?rev=2645&view=rev Author: mgist Date: 2008-12-08 05:11:54 +0000 (Mon, 08 Dec 2008) Log Message: ----------- - Added missing engine<->loader sync. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2008-12-08 01:13:54 UTC (rev 2644) +++ trunk/src/server/gem.cpp 2008-12-08 05:11:54 UTC (rev 2645) @@ -773,6 +773,7 @@ csRef<iThreadedLoader> loader (csQueryRegistry<iThreadedLoader> (psserver->GetObjectReg())); csRef<iThreadReturn> ret = loader->LoadNode(root); ret->Wait(); + engine->SyncEngineListsNow(loader); meshFact = engine->GetMeshFactories()->FindByName(factname); if(meshFact.IsValid()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2008-12-11 18:44:16
|
Revision: 2668 http://planeshift.svn.sourceforge.net/planeshift/?rev=2668&view=rev Author: weltall2 Date: 2008-12-11 18:44:06 +0000 (Thu, 11 Dec 2008) Log Message: ----------- uids are uint32 Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2008-12-11 10:21:06 UTC (rev 2667) +++ trunk/src/server/gem.cpp 2008-12-11 18:44:06 UTC (rev 2668) @@ -314,7 +314,7 @@ return dynamic_cast<gemNPC*>(actors_by_pid.Get(npc_id, NULL)); } -gemItem *GEMSupervisor::FindItemEntity(int item_id) +gemItem *GEMSupervisor::FindItemEntity(uint32 item_id) { return items_by_uid.Get(item_id, NULL); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Ven...@us...> - 2008-12-18 19:31:27
|
Revision: 2714 http://planeshift.svn.sourceforge.net/planeshift/?rev=2714&view=rev Author: Vengeance2001 Date: 2008-12-18 19:31:22 +0000 (Thu, 18 Dec 2008) Log Message: ----------- Changed delay calculation slightly and made it apply differently, so long text shows for longer instead of taking longer to show. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2008-12-18 19:13:47 UTC (rev 2713) +++ trunk/src/server/gem.cpp 2008-12-18 19:31:22 UTC (rev 2714) @@ -3235,15 +3235,14 @@ else if (actionNarrate) chtype = CHAT_NPC_NARRATE; - // first response gets 2 seconds delay to simulate NPC thinking + // first response gets 1 second delay to simulate NPC thinking // subsequent ones add to the current time delay, and send delayed if (timeDelay==0) - timeDelay = (csTicks)(2000); - else - timeDelay += (csTicks)(1000 + 30*strlen(actText)); + timeDelay = (csTicks)(1000); psChatMessage msg(destClientID,GetName(),0,actText,chtype,false); - psserver->GetEventManager()->SendMessageDelayed(msg.msg,timeDelay); + + timeDelay += (csTicks)(1000 + 30*strlen(actText)); } float gemActor::FallEnded(const csVector3& pos, iSector* sector) @@ -3766,13 +3765,12 @@ // Some NPC responses are now in the form of private tells. psChatMessage newMsg(who->GetClientNum(), GetName(), 0, strsay, CHAT_NPC, false); - // first response gets 2 seconds delay to simulate NPC thinking + // first response gets 1 second delay to simulate NPC thinking // subsequent ones add to the current time delay, and send delayed if (timeDelay==0) - timeDelay = (csTicks)(2000); - else - timeDelay += (csTicks)(1000 + 30*strlen(strsay)); + timeDelay = (csTicks)(1000); psserver->GetEventManager()->SendMessageDelayed(newMsg.msg,timeDelay); + timeDelay += (csTicks)(2000 + 50*strlen(strsay)); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-01-24 07:03:54
|
Revision: 2946 http://planeshift.svn.sourceforge.net/planeshift/?rev=2946&view=rev Author: weltall2 Date: 2009-01-24 07:03:52 +0000 (Sat, 24 Jan 2009) Log Message: ----------- removed some code Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-01-24 06:53:09 UTC (rev 2945) +++ trunk/src/server/gem.cpp 2009-01-24 07:03:52 UTC (rev 2946) @@ -1543,11 +1543,9 @@ InstanceID myInstance, iSector* room, const csVector3& pos, - float xrotangle, - float yrotangle, - float zrotangle, + float rotangle, int clientnum) - : gemItem(item,factname,filename,myInstance,room,pos,xrotangle,yrotangle,zrotangle,clientnum) + : gemItem(item,factname,filename,myInstance,room,pos,rotangle,clientnum) { } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-02-16 21:15:55
|
Revision: 3046 http://planeshift.svn.sourceforge.net/planeshift/?rev=3046&view=rev Author: mgist Date: 2009-02-16 21:15:50 +0000 (Mon, 16 Feb 2009) Log Message: ----------- - Make warning more informative. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-02-16 21:07:00 UTC (rev 3045) +++ trunk/src/server/gem.cpp 2009-02-16 21:15:50 UTC (rev 3046) @@ -2682,17 +2682,17 @@ // will take to long to process. if (width < 0.2) { - Warning4(LOG_ANY, "Width %.2f to small for %s(%s)", width, GetName(), ShowID(pid)); + Warning4(LOG_ANY, "Raceinfo width %.2f is too small for %s(%s). Using default.", width, GetName(), ShowID(pid)); width = 0.8F; } if (depth < 0.2*1.33) { - Warning4(LOG_ANY, "Depth %.2f to small for %s(%s)", depth, GetName(), ShowID(pid)); + Warning4(LOG_ANY, "Raceinfo depth %.2f is too small for %s(%s). Using default.", depth, GetName(), ShowID(pid)); depth = 0.6F*1.33F; } if (height < 0.2F) { - Warning4(LOG_ANY, "Height %.2f to small for %s(%s)", height, GetName(), ShowID(pid)); + Warning4(LOG_ANY, "Raceinfo height %.2f is too small for %s(%s). Using default.", height, GetName(), ShowID(pid)); height = 1.4F; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-02-18 09:08:53
|
Revision: 3054 http://planeshift.svn.sourceforge.net/planeshift/?rev=3054&view=rev Author: weltall2 Date: 2009-02-18 09:08:49 +0000 (Wed, 18 Feb 2009) Log Message: ----------- removed some old code patch by Loyni Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-02-18 06:31:59 UTC (rev 3053) +++ trunk/src/server/gem.cpp 2009-02-18 09:08:49 UTC (rev 3054) @@ -3370,11 +3370,6 @@ { if (!anim) return; - - csRef<iSpriteCal3DState> spstate = scfQueryInterface<iSpriteCal3DState> (GetMeshWrapper()->GetMeshObject()); - - // Player must be standing for anim to happen - spstate->SetAnimAction(anim,.25,.25); psOverrideActionMessage action(0, eid, anim); action.Multicast(GetMulticastClients(),-1,0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-03-06 23:41:14
|
Revision: 3142 http://planeshift.svn.sourceforge.net/planeshift/?rev=3142&view=rev Author: kougaro Date: 2009-03-06 23:41:05 +0000 (Fri, 06 Mar 2009) Log Message: ----------- Fixed PS#2795 - guarding range ignores instance Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-03-06 22:49:03 UTC (rev 3141) +++ trunk/src/server/gem.cpp 2009-03-06 23:41:05 UTC (rev 3142) @@ -1184,7 +1184,8 @@ if (guardCharacterID.IsValid() && guardCharacterID != actor->GetCharacterData()->GetPID() && guardActor && - guardActor->RangeTo(item->GetGemObject()) < RANGE_TO_SELECT) + guardActor->RangeTo(item->GetGemObject()) < RANGE_TO_SELECT && + (guardActor->GetInstance() == this->GetInstance())) { psserver->SendSystemInfo(clientnum,"You notice that the item is being guarded by %s", guardActor->GetCharacterData()->GetCharFullName()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-03-15 14:47:41
|
Revision: 3220 http://planeshift.svn.sourceforge.net/planeshift/?rev=3220&view=rev Author: Khakilord Date: 2009-03-15 14:47:34 +0000 (Sun, 15 Mar 2009) Log Message: ----------- Removed psStaminaRest event as this behaviour should already be covered by the StatDR updates. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-03-15 14:17:57 UTC (rev 3219) +++ trunk/src/server/gem.cpp 2009-03-15 14:47:34 UTC (rev 3220) @@ -642,7 +642,7 @@ gemItem *itemPtr = GetItemPtr(); if(itemPtr) return itemPtr->GetItemData(); - + return NULL; } @@ -1400,7 +1400,7 @@ this->xRot = xrotangle; this->yRot = yrotangle; this->zRot = zrotangle; - + itemdata->SetRotationInWorld(xrotangle,yrotangle,zrotangle); itemdata->Save(false); } @@ -2927,20 +2927,6 @@ } } -/// Event to recheck stamina after a delay -class psStaminaRest : public psGameEvent -{ -protected: - csWeakRef<gemObject> actor; -public: - psStaminaRest(int length, gemActor* a) : psGameEvent(0,length,"psStaminaRest"), actor(a) {} - virtual void Trigger() - { - gemActor* a = static_cast<gemActor*>((gemObject *) actor); - if (a) a->ProcessStamina(0.0f,true); - } -}; - void gemActor::ApplyStaminaCalculations(const csVector3& v, float times) { csVector3 thisV = lastV; @@ -3055,9 +3041,6 @@ SetMode(PSCHARACTER_MODE_EXHAUSTED); psChar->SetStaminaRegenerationStill(); psserver->SendSystemResult(GetClientID(),"You're too exhausted to move"); - - // Wake us up in a couple seconds - psserver->GetEventManager()->Push( new psStaminaRest(2000,this) ); } else if (GetMode() == PSCHARACTER_MODE_EXHAUSTED) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-03-26 14:35:43
|
Revision: 3321 http://planeshift.svn.sourceforge.net/planeshift/?rev=3321&view=rev Author: KhakiLord Date: 2009-03-26 14:35:34 +0000 (Thu, 26 Mar 2009) Log Message: ----------- Changed minimum proxlist distance. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-03-26 11:30:34 UTC (rev 3320) +++ trunk/src/server/gem.cpp 2009-03-26 14:35:34 UTC (rev 3321) @@ -907,9 +907,9 @@ if (player_count > PROX_LIST_SHRINK_THRESHOLD) { prox_distance_current-=PROX_LIST_STEP_SIZE; - if (prox_distance_current<0) + if (prox_distance_current<2) { - prox_distance_current=0; + prox_distance_current=2; } } /* Step up if we're small enough This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-03-26 22:56:23
|
Revision: 3324 http://planeshift.svn.sourceforge.net/planeshift/?rev=3324&view=rev Author: KhakiLord Date: 2009-03-26 22:56:15 +0000 (Thu, 26 Mar 2009) Log Message: ----------- Improved proxlist info messages. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-03-26 18:24:58 UTC (rev 3323) +++ trunk/src/server/gem.cpp 2009-03-26 22:56:15 UTC (rev 3324) @@ -954,11 +954,11 @@ } } - if (csGetTicks() - time > 500) + if (csGetTicks() - time > 500 || player_count > 100) { csString status; - status.Format("Warning: Spent %u time getting untouched objects in proxlist for %s, %zu nearby entities!", - csGetTicks() - time, GetName(), count); + status.Format("Warning: Spent %u time getting untouched objects in proxlist for %s, %zu nearby entities, distance %g!", + csGetTicks() - time, GetName(), player_count, prox_distance_current); psserver->GetLogCSV()->Write(CSV_STATUS, status); } @@ -976,12 +976,12 @@ } } - if (csGetTicks() - time > 500) + if (csGetTicks() - time > 500 || player_count > 100) { csString status; status.Format("Warning: Spent %u time touching entities in proxlist for %s," - " counted %zu nearby entities, %zu untouched objects that it watches!", - csGetTicks() - time, GetName(), count, debug_count); + " counted %zu nearby entities, %zu untouched objects that it watches, distance %g!", + csGetTicks() - time, GetName(), player_count, debug_count, prox_distance_current); psserver->GetLogCSV()->Write(CSV_STATUS, status); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-04-03 01:13:34
|
Revision: 3387 http://planeshift.svn.sourceforge.net/planeshift/?rev=3387&view=rev Author: kougaro Date: 2009-04-03 01:13:31 +0000 (Fri, 03 Apr 2009) Log Message: ----------- correct an error in previous commit Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-04-02 21:11:26 UTC (rev 3386) +++ trunk/src/server/gem.cpp 2009-04-03 01:13:31 UTC (rev 3387) @@ -221,7 +221,7 @@ { CS_ASSERT(!entities_by_eid.Contains(objEid)); entities_by_eid.Put(objEid, obj); - Debug3(LOG_CELPERSIST,0,"Entity <%s> added to supervisor as %s\n", obj->GetName(), ShowID(eid)); + Debug3(LOG_CELPERSIST,0,"Entity <%s> added to supervisor as %s\n", obj->GetName(), ShowID(objEid)); } void GEMSupervisor::AddActorEntity(gemActor *actor) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-04-14 09:58:41
|
Revision: 3448 http://planeshift.svn.sourceforge.net/planeshift/?rev=3448&view=rev Author: weltall2 Date: 2009-04-14 09:58:30 +0000 (Tue, 14 Apr 2009) Log Message: ----------- don't show the marriage button when a char with a gender right clicks on a genderless char Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-04-13 18:16:04 UTC (rev 3447) +++ trunk/src/server/gem.cpp 2009-04-14 09:58:30 UTC (rev 3448) @@ -3441,7 +3441,9 @@ if ( ( GetCharacterData()->GetRaceInfo()->gender == PSCHARACTER_GENDER_NONE && activeActor->GetCharacterData()->GetRaceInfo()->gender == PSCHARACTER_GENDER_NONE ) || ( GetCharacterData()->GetRaceInfo()->gender != - activeActor->GetCharacterData()->GetRaceInfo()->gender ) ) + activeActor->GetCharacterData()->GetRaceInfo()->gender && + GetCharacterData()->GetRaceInfo()->gender != PSCHARACTER_GENDER_NONE + && activeActor->GetCharacterData()->GetRaceInfo()->gender != PSCHARACTER_GENDER_NONE ) ) { options |= psGUIInteractMessage::MARRIAGE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-04-14 11:17:57
|
Revision: 3450 http://planeshift.svn.sourceforge.net/planeshift/?rev=3450&view=rev Author: weltall2 Date: 2009-04-14 11:17:47 +0000 (Tue, 14 Apr 2009) Log Message: ----------- Fixed wrong attack icon showing in wrong circunstances Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-04-14 10:00:22 UTC (rev 3449) +++ trunk/src/server/gem.cpp 2009-04-14 11:17:47 UTC (rev 3450) @@ -3420,8 +3420,9 @@ options |= psGUIInteractMessage::EXCHANGE; // Can we attack this player? - Client* meC = psserver->GetNetManager()->GetClient(GetClientID()); - if (IsAlive() && activeActor->IsAlive() && meC && meC->IsAllowedToAttack(actor,false)) + + Client* attackerClient = psserver->GetNetManager()->GetClient(activeActor->GetClientID()); + if (IsAlive() && activeActor->IsAlive() && attackerClient && attackerClient->IsAllowedToAttack(this,false)) options |= psGUIInteractMessage::ATTACK; /*Options for a wedding or a divorce, in order to show the proper button. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Kha...@us...> - 2009-04-26 13:11:37
|
Revision: 3563 http://planeshift.svn.sourceforge.net/planeshift/?rev=3563&view=rev Author: KhakiLord Date: 2009-04-26 13:11:26 +0000 (Sun, 26 Apr 2009) Log Message: ----------- Made proxlist debug message more informative. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-04-26 13:06:28 UTC (rev 3562) +++ trunk/src/server/gem.cpp 2009-04-26 13:11:26 UTC (rev 3563) @@ -980,8 +980,8 @@ if (csGetTicks() - time > 500 || player_count > 100) { csString status; - status.Format("Warning: Spent %u time getting untouched objects in proxlist for %s, %zu nearby entities, distance %g!", - csGetTicks() - time, GetName(), player_count, prox_distance_current); + status.Format("Warning: Spent %u time getting untouched objects in proxlist for %s, %zu nearby entities, distance %g, location: %g %g %g %s!", + csGetTicks() - time, GetName(), player_count, prox_distance_current, pos.x, pos.y, pos.z, (const char *)sector->QueryObject()->GetName()); psserver->GetLogCSV()->Write(CSV_STATUS, status); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-05-04 10:41:10
|
Revision: 3617 http://planeshift.svn.sourceforge.net/planeshift/?rev=3617&view=rev Author: kougaro Date: 2009-05-04 10:41:01 +0000 (Mon, 04 May 2009) Log Message: ----------- Changed the way to obtain position infos so that it works for objects that do not have a mesh attached server-side Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-05-04 09:54:29 UTC (rev 3616) +++ trunk/src/server/gem.cpp 2009-05-04 10:41:01 UTC (rev 3617) @@ -1041,7 +1041,7 @@ void gemObject::GetPosition(csVector3& pos, float& yrot,iSector*& sector) { // Position - pos = GetMeshWrapper()->GetMovable()->GetPosition(); + pos = this->pos; // Rotation yrot = GetAngle(); @@ -1053,7 +1053,7 @@ void gemObject::GetPosition(csVector3& pos, iSector*& sector) { // Position - pos = GetMeshWrapper()->GetMovable()->GetPosition(); + pos = this->pos; // Sector sector = GetSector(); @@ -1062,17 +1062,13 @@ float gemObject::GetAngle() { // Rotation - csMatrix3 transf = GetMeshWrapper()->GetMovable()->GetTransform().GetT2O(); - return psWorld::Matrix2YRot(transf); + return this->yRot; } iSector* gemObject::GetSector() { // Sector - if (GetMeshWrapper()->GetMovable()->GetSectors()->GetCount()) - return GetMeshWrapper()->GetMovable()->GetSectors()->Get(0); - else - return NULL; + return this->sector; } void gemObject::SendBehaviorMessage(const csString & str, gemObject *actor) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-05-05 02:25:04
|
Revision: 3622 http://planeshift.svn.sourceforge.net/planeshift/?rev=3622&view=rev Author: kougaro Date: 2009-05-05 02:24:55 +0000 (Tue, 05 May 2009) Log Message: ----------- This is a hash and we got the key, no need to iterate over all entries. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-05-04 22:56:55 UTC (rev 3621) +++ trunk/src/server/gem.cpp 2009-05-05 02:24:55 UTC (rev 3622) @@ -279,18 +279,7 @@ if (!id.IsValid()) return NULL; - csHash<gemObject*, EID>::Iterator i(entities_by_eid.GetIterator(id)); - gemObject* obj; - - while ( i.HasNext() ) - { - obj = i.Next(); - if (obj->GetEID() == id) - { - return obj; - } - } - return NULL; + return entities_by_eid.Get(id, NULL); } gemObject *GEMSupervisor::FindObject(const csString& name) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-05-14 21:36:01
|
Revision: 3688 http://planeshift.svn.sourceforge.net/planeshift/?rev=3688&view=rev Author: kennygraunke Date: 2009-05-14 21:35:52 +0000 (Thu, 14 May 2009) Log Message: ----------- Trivial cleanups Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-05-14 20:42:23 UTC (rev 3687) +++ trunk/src/server/gem.cpp 2009-05-14 21:35:52 UTC (rev 3688) @@ -745,15 +745,9 @@ bool gemObject::IsNear(gemObject *obj, float radius) { - float distance = proxlist->RangeTo(obj); - - if ( distance < radius) - return true; - else - return false; + return proxlist->RangeTo(obj) < radius; } - float gemObject::RangeTo(gemObject* obj, bool ignoreY, bool ignoreInstance) { return proxlist->RangeTo(obj, ignoreY, ignoreInstance); @@ -776,9 +770,8 @@ proxlist->Initialize(clientnum,this); // store these for fast access later - bool subscribed_self=false; // A client should always subscribe to itself - if (!subscribed_self && clientnum) + if (clientnum) { // CPrintf(CON_DEBUG, "Forcing a self-subscription for %s\n",GetName()); proxlist->StartMutualWatching(clientnum,this,0.0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-05-14 23:28:51
|
Revision: 3690 http://planeshift.svn.sourceforge.net/planeshift/?rev=3690&view=rev Author: weltall2 Date: 2009-05-14 23:28:43 +0000 (Thu, 14 May 2009) Log Message: ----------- fixing some warnings in MSVC patch by loyni Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-05-14 22:46:18 UTC (rev 3689) +++ trunk/src/server/gem.cpp 2009-05-14 23:28:43 UTC (rev 3690) @@ -2158,16 +2158,16 @@ iSector *sector = pcmove->GetSector(); if (sector && !strncmp ("NPCroom", sector->QueryObject()->GetName(), 7)) { - Teleport("NPCroom", csVector3(-20, 1, -180), 0, worldInstance); + Teleport("NPCroom", csVector3(-20.0f, 1.0f, -180.0f), 0.0f, worldInstance); } else if (sector && !strncmp ("tutorial", sector->QueryObject()->GetName(), 8)) { - Teleport("tutorial", csVector3(-232, 21.31, 31.5), 4, worldInstance); + Teleport("tutorial", csVector3(-232.0f, 21.31f, 31.5f), 4.0f, worldInstance); } else { // TODO: Get Death Realm location from db somewhere - Teleport("DR01", csVector3(-29.2, -119, 28.2), 0, DEFAULT_INSTANCE); + Teleport("DR01", csVector3(-29.2f, -119.0f, 28.2f), 0.0f, DEFAULT_INSTANCE); } psChar->SetHitPoints(psChar->GetMaxHP().Base()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-05-22 09:15:47
|
Revision: 3757 http://planeshift.svn.sourceforge.net/planeshift/?rev=3757&view=rev Author: kennygraunke Date: 2009-05-22 09:15:25 +0000 (Fri, 22 May 2009) Log Message: ----------- - Fixed uninitialized yRot variable in gemItem. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-05-22 09:08:10 UTC (rev 3756) +++ trunk/src/server/gem.cpp 2009-05-22 09:15:25 UTC (rev 3757) @@ -1302,6 +1302,7 @@ { itemdata=item; xRot=xrotangle; + yRot=yrotangle; zRot=zrotangle; itemType.Format("Item(%s)",itemdata->GetItemType()); itemdata->SetGemObject( this ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-05-27 09:17:43
|
Revision: 3790 http://planeshift.svn.sourceforge.net/planeshift/?rev=3790&view=rev Author: weltall2 Date: 2009-05-27 09:17:35 +0000 (Wed, 27 May 2009) Log Message: ----------- why action locations aren't in the proxylist? it only creates issues for the client not understanding that his target is gone. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-05-27 04:23:42 UTC (rev 3789) +++ trunk/src/server/gem.cpp 2009-05-27 09:17:35 UTC (rev 3790) @@ -1741,7 +1741,7 @@ this->prox_distance_desired = 0.0F; this->prox_distance_current = 0.0F; - visible = false; + visible = true; SetName(name); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-10 13:02:36
|
Revision: 3836 http://planeshift.svn.sourceforge.net/planeshift/?rev=3836&view=rev Author: weltall2 Date: 2009-06-10 13:02:29 +0000 (Wed, 10 Jun 2009) Log Message: ----------- reverted a patch which shouldn't have been committed yet Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-06-10 11:16:04 UTC (rev 3835) +++ trunk/src/server/gem.cpp 2009-06-10 13:02:29 UTC (rev 3836) @@ -739,6 +739,8 @@ pcmesh->MoveMesh(room, rotangle, pos); } +#define PSABS(x) ((x) < 0 ? -(x) : (x)) + bool gemObject::IsNear(gemObject *obj, float radius) { return proxlist->RangeTo(obj) < radius; @@ -3254,7 +3256,7 @@ { psChar->SetLocationInWorld(worldInstance,sectorInfo, drmsg.pos.x, drmsg.pos.y, drmsg.pos.z, drmsg.yrot ); - if (IsSpellCasting() && drmsg.vel.SquaredNorm() > 13.0f) + if (IsSpellCasting() && PSABS(drmsg.vel.SquaredNorm()) > 13.0f) { InterruptSpellCasting(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-06-11 21:58:11
|
Revision: 3841 http://planeshift.svn.sourceforge.net/planeshift/?rev=3841&view=rev Author: kougaro Date: 2009-06-11 21:58:00 +0000 (Thu, 11 Jun 2009) Log Message: ----------- Remove an unneeded macro Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-06-10 16:13:14 UTC (rev 3840) +++ trunk/src/server/gem.cpp 2009-06-11 21:58:00 UTC (rev 3841) @@ -739,8 +739,6 @@ pcmesh->MoveMesh(room, rotangle, pos); } -#define PSABS(x) ((x) < 0 ? -(x) : (x)) - bool gemObject::IsNear(gemObject *obj, float radius) { return proxlist->RangeTo(obj) < radius; @@ -3256,7 +3254,7 @@ { psChar->SetLocationInWorld(worldInstance,sectorInfo, drmsg.pos.x, drmsg.pos.y, drmsg.pos.z, drmsg.yrot ); - if (IsSpellCasting() && PSABS(drmsg.vel.SquaredNorm()) > 13.0f) + if (IsSpellCasting() && drmsg.vel.SquaredNorm() > 13.0f) { InterruptSpellCasting(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-18 07:38:20
|
Revision: 3846 http://planeshift.svn.sourceforge.net/planeshift/?rev=3846&view=rev Author: weltall2 Date: 2009-06-18 07:38:18 +0000 (Thu, 18 Jun 2009) Log Message: ----------- fixed a crash during char loading Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-06-18 07:16:37 UTC (rev 3845) +++ trunk/src/server/gem.cpp 2009-06-18 07:38:18 UTC (rev 3846) @@ -1896,7 +1896,7 @@ SetPrevTeleportLocation(pos, rotangle, GetSector(), myInstance); // Set the initial valid location to be the spot the actor was created at. - UpdateValidLocation(pos, rotangle, GetSector(), true); + UpdateValidLocation(pos, rotangle, GetSector(), myInstance, true); GetCharacterData()->SetStaminaRegenerationStill(); @@ -3060,7 +3060,7 @@ if (sectorInfo != NULL) { psChar->SetLocationInWorld(worldInstance, sectorInfo, pos.x, pos.y, pos.z, angle ); - UpdateValidLocation(pos, angle, sector, true); + UpdateValidLocation(pos, angle, sector, worldInstance, true); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-24 20:40:32
|
Revision: 3865 http://planeshift.svn.sourceforge.net/planeshift/?rev=3865&view=rev Author: weltall2 Date: 2009-06-24 20:39:04 +0000 (Wed, 24 Jun 2009) Log Message: ----------- Added bracer support with groups defined in db. $B will substituite the racename in bracer meshfacts name DB BUMP: 1222 NET BUMP: 0xA0 part 2 / 2 Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-06-24 20:32:37 UTC (rev 3864) +++ trunk/src/server/gem.cpp 2009-06-24 20:39:04 UTC (rev 3865) @@ -2502,7 +2502,8 @@ } uint32_t flags = 0; - csString helmGroup = psChar->GetHelmGroup(); + csString helmGroup = psChar->GetHelmGroup(); + csString BracerGroup = psChar->GetBracerGroup(); if (!GetVisibility()) flags |= psPersistActor::INVISIBLE; if (GetInvincibility()) flags |= psPersistActor::INVINCIBLE; @@ -2529,6 +2530,7 @@ psChar->GetRaceInfo()->name, psChar->GetRaceInfo()->gender, helmGroup, + BracerGroup, top, bottom,offset, texparts, equipmentParts, @@ -4273,7 +4275,8 @@ flags |= psPersistActor::NAMEKNOWN;*/ } - csString helmGroup = psChar->GetHelmGroup(); + csString helmGroup = psChar->GetHelmGroup(); + csString BracerGroup = psChar->GetBracerGroup(); psPersistActor mesg( clientnum, @@ -4286,6 +4289,7 @@ psChar->GetRaceInfo()->name, psChar->GetRaceInfo()->gender, helmGroup, + BracerGroup, top, bottom,offset, texparts, equipmentParts, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-06-25 07:21:18
|
Revision: 3870 http://planeshift.svn.sourceforge.net/planeshift/?rev=3870&view=rev Author: weltall2 Date: 2009-06-25 07:21:17 +0000 (Thu, 25 Jun 2009) Log Message: ----------- update helm/bracer groups depending on the set mesh Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-06-25 06:17:17 UTC (rev 3869) +++ trunk/src/server/gem.cpp 2009-06-25 07:21:17 UTC (rev 3870) @@ -1839,7 +1839,23 @@ void OverridableMesh::OnChange() { if (actor) + { + //NOTE: maybe we should change also the raceinfo of the character? But this would affect the output + // of a lot of things, including the save functions of the character + psRaceInfo* race = CacheManager::GetSingleton().GetRaceInfoByMeshName(Current()); + if (race != NULL) + { + actor->GetCharacterData()->SetHelmGroup(race->GetHelmGroup()); + actor->GetCharacterData()->SetBracerGroup(race->GetBracerGroup()); + } + else //default no group + { + actor->GetCharacterData()->SetHelmGroup(""); + actor->GetCharacterData()->SetBracerGroup(""); + } + actor->SetMesh(Current()); + } } //-------------------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |