From: <wel...@us...> - 2009-07-03 20:37:00
|
Revision: 3905 http://planeshift.svn.sourceforge.net/planeshift/?rev=3905&view=rev Author: weltall2 Date: 2009-07-03 20:37:00 +0000 (Fri, 03 Jul 2009) Log Message: ----------- Added support for belts and cloaks Fixed missing changes in parts of code NETBUMP 0x1224 NETVERBUMP 0xA1 part 2/2 Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-03 20:32:46 UTC (rev 3904) +++ trunk/src/server/gem.cpp 2009-07-03 20:37:00 UTC (rev 3905) @@ -1847,11 +1847,15 @@ { actor->GetCharacterData()->SetHelmGroup(race->GetHelmGroup()); actor->GetCharacterData()->SetBracerGroup(race->GetBracerGroup()); + actor->GetCharacterData()->SetBeltGroup(race->GetBeltGroup()); + actor->GetCharacterData()->SetCloakGroup(race->GetCloakGroup()); } else //default no group { actor->GetCharacterData()->SetHelmGroup(""); actor->GetCharacterData()->SetBracerGroup(""); + actor->GetCharacterData()->SetBeltGroup(""); + actor->GetCharacterData()->SetCloakGroup(""); } actor->SetMesh(Current()); @@ -2520,6 +2524,8 @@ uint32_t flags = 0; csString helmGroup = psChar->GetHelmGroup(); csString BracerGroup = psChar->GetBracerGroup(); + csString BeltGroup = psChar->GetBeltGroup(); + csString CloakGroup = psChar->GetCloakGroup(); if (!GetVisibility()) flags |= psPersistActor::INVISIBLE; if (GetInvincibility()) flags |= psPersistActor::INVINCIBLE; @@ -2547,6 +2553,8 @@ psChar->GetRaceInfo()->gender, helmGroup, BracerGroup, + BeltGroup, + CloakGroup, top, bottom,offset, texparts, equipmentParts, @@ -4293,6 +4301,8 @@ csString helmGroup = psChar->GetHelmGroup(); csString BracerGroup = psChar->GetBracerGroup(); + csString BeltGroup = psChar->GetBeltGroup(); + csString CloakGroup = psChar->GetCloakGroup(); psPersistActor mesg( clientnum, @@ -4306,6 +4316,8 @@ psChar->GetRaceInfo()->gender, helmGroup, BracerGroup, + BeltGroup, + CloakGroup, top, bottom,offset, texparts, equipmentParts, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-07-08 18:03:32
|
Revision: 3950 http://planeshift.svn.sourceforge.net/planeshift/?rev=3950&view=rev Author: kougaro Date: 2009-07-08 18:03:28 +0000 (Wed, 08 Jul 2009) Log Message: ----------- Bypass the range check when an AL got (0,0,0) as a position Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-08 16:08:05 UTC (rev 3949) +++ trunk/src/server/gem.cpp 2009-07-08 18:03:28 UTC (rev 3950) @@ -741,11 +741,16 @@ bool gemObject::IsNear(gemObject *obj, float radius) { - return proxlist->RangeTo(obj) < radius; + return RangeTo(obj) < radius; } float gemObject::RangeTo(gemObject* obj, bool ignoreY, bool ignoreInstance) { + // Ugly hack : if an AL got (0,0,0) as a position, bypass the check + if((GetALPtr() && GetPosition() == csVector3(0,0,0)) || + (obj->GetALPtr() && obj->GetPosition() == csVector3(0,0,0))) + return 0.0f; + return proxlist->RangeTo(obj, ignoreY, ignoreInstance); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-07-12 19:14:36
|
Revision: 3997 http://planeshift.svn.sourceforge.net/planeshift/?rev=3997&view=rev Author: weltall2 Date: 2009-07-12 19:02:24 +0000 (Sun, 12 Jul 2009) Log Message: ----------- Fixed PS#1724 Attacking 2 targets simultaneously - Kill one stops combat patch by celestar Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-12 18:46:43 UTC (rev 3996) +++ trunk/src/server/gem.cpp 2009-07-12 19:02:24 UTC (rev 3997) @@ -2344,7 +2344,8 @@ // if damage due to spell then spell is ending anyway, so no need to force // 'stop attack.' - if (attacker && attacker->GetMode() == PSCHARACTER_MODE_COMBAT) + if (attacker && attacker->GetMode() == PSCHARACTER_MODE_COMBAT && + attacker->GetClient()->GetTargetObject() == this) { psserver->combatmanager->StopAttack(attacker); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-23 14:20:16
|
Revision: 4101 http://planeshift.svn.sourceforge.net/planeshift/?rev=4101&view=rev Author: mgist Date: 2009-07-23 14:20:10 +0000 (Thu, 23 Jul 2009) Log Message: ----------- - Regen stamina at sitting rate while overweight. Resolves #734. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-22 04:01:30 UTC (rev 4100) +++ trunk/src/server/gem.cpp 2009-07-23 14:20:10 UTC (rev 4101) @@ -2995,13 +2995,13 @@ break; case PSCHARACTER_MODE_SIT: + case PSCHARACTER_MODE_OVERWEIGHT: psChar->SetStaminaRegenerationSitting(); break; case PSCHARACTER_MODE_DEAD: - case PSCHARACTER_MODE_OVERWEIGHT: case PSCHARACTER_MODE_STATUE: - psChar->SetStaminaRegenerationNone(); // no stamina regen while dead or overweight + psChar->SetStaminaRegenerationNone(); // no stamina regen while dead break; case PSCHARACTER_MODE_DEFEATED: psChar->GetHPRate().SetBase(HP_REGEN_RATE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-24 01:20:57
|
Revision: 4112 http://planeshift.svn.sourceforge.net/planeshift/?rev=4112&view=rev Author: mgist Date: 2009-07-24 01:20:50 +0000 (Fri, 24 Jul 2009) Log Message: ----------- - Fixed movement stamina drain being applied twice. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-23 20:10:17 UTC (rev 4111) +++ trunk/src/server/gem.cpp 2009-07-24 01:20:50 UTC (rev 4112) @@ -3253,7 +3253,6 @@ psChar->SetStaminaRegenerationWalk(); VitalBuffable & pRate = psChar->GetPStaminaRate(); pRate.SetBase(pRate.Base()-value); - psChar->AdjustStamina(-value*times,true); } else // Another regen in place { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-07-24 07:42:41
|
Revision: 4113 http://planeshift.svn.sourceforge.net/planeshift/?rev=4113&view=rev Author: weltall2 Date: 2009-07-24 07:42:35 +0000 (Fri, 24 Jul 2009) Log Message: ----------- fixed grammar Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-24 01:20:50 UTC (rev 4112) +++ trunk/src/server/gem.cpp 2009-07-24 07:42:35 UTC (rev 4113) @@ -2904,7 +2904,7 @@ const char* gemActor::GetModeStr() { - static const char *strs[] = {"unknown","peace","combat","spell casting","working","dead","sitting","carrying too much","exhausted", "defeated", "statued" }; + static const char *strs[] = {"unknown","doing nothing","in combat","spell casting","working","dead","sitting","carrying too much","exhausted", "defeated", "statued" }; return strs[player_mode]; } @@ -3114,7 +3114,7 @@ } } -//#define STAMINA_PROCESS_DEBUG +#define STAMINA_PROCESS_DEBUG void gemActor::ProcessStamina() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-24 12:46:47
|
Revision: 4117 http://planeshift.svn.sourceforge.net/planeshift/?rev=4117&view=rev Author: mgist Date: 2009-07-24 12:46:35 +0000 (Fri, 24 Jul 2009) Log Message: ----------- - Update stamina regen rate while sitting. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-24 12:23:11 UTC (rev 4116) +++ trunk/src/server/gem.cpp 2009-07-24 12:46:35 UTC (rev 4117) @@ -3178,6 +3178,8 @@ if (GetMode() == PSCHARACTER_MODE_PEACE || GetMode() == PSCHARACTER_MODE_SPELL_CASTING) psChar->SetStaminaRegenerationStill(); + else if (GetMode() == PSCHARACTER_MODE_SIT) + psChar->SetStaminaRegenerationSitting(); } else // Moving { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-24 12:52:31
|
Revision: 4118 http://planeshift.svn.sourceforge.net/planeshift/?rev=4118&view=rev Author: mgist Date: 2009-07-24 12:52:25 +0000 (Fri, 24 Jul 2009) Log Message: ----------- - Added max pstamina var to movement stamina drain. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-24 12:46:35 UTC (rev 4117) +++ trunk/src/server/gem.cpp 2009-07-24 12:52:25 UTC (rev 4118) @@ -3236,6 +3236,7 @@ env.Define("AscentAngle", Angle); // How steep your climb is env.Define("Weight", psChar->Inventory().GetCurrentTotalWeight()); // How much you're carrying env.Define("MaxWeight", psChar->Inventory().MaxWeight()); // How much you can carry + env.Define("MaxStamina", psChar->GetMaxPStamina().Current()); // Max stamina of the character // Do stuff with stuff script->Evaluate(&env); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-07-25 00:57:03
|
Revision: 4121 http://planeshift.svn.sourceforge.net/planeshift/?rev=4121&view=rev Author: mgist Date: 2009-07-25 00:56:55 +0000 (Sat, 25 Jul 2009) Log Message: ----------- - Comment out stamina debug define. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-07-24 21:52:28 UTC (rev 4120) +++ trunk/src/server/gem.cpp 2009-07-25 00:56:55 UTC (rev 4121) @@ -3114,7 +3114,7 @@ } } -#define STAMINA_PROCESS_DEBUG +//#define STAMINA_PROCESS_DEBUG void gemActor::ProcessStamina() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-03 07:59:10
|
Revision: 4171 http://planeshift.svn.sourceforge.net/planeshift/?rev=4171&view=rev Author: weltall2 Date: 2009-08-03 07:58:54 +0000 (Mon, 03 Aug 2009) Log Message: ----------- fixed a crash when picking up money Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-08-03 07:53:49 UTC (rev 4170) +++ trunk/src/server/gem.cpp 2009-08-03 07:58:54 UTC (rev 4171) @@ -1246,7 +1246,7 @@ psserver->GetCharManager()->UpdateItemViews(clientnum); - GEMSupervisor::GetSingleton().RemoveItemEntity(dynamic_cast<gemItem*>(this)); + if(item) GEMSupervisor::GetSingleton().RemoveItemEntity(dynamic_cast<gemItem*>(this)); EntityManager::GetSingleton().RemoveActor(this); // Destroy this } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-08-25 07:44:54
|
Revision: 4250 http://planeshift.svn.sourceforge.net/planeshift/?rev=4250&view=rev Author: weltall2 Date: 2009-08-25 07:44:46 +0000 (Tue, 25 Aug 2009) Log Message: ----------- fixed a debug message Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-08-25 05:58:17 UTC (rev 4249) +++ trunk/src/server/gem.cpp 2009-08-25 07:44:46 UTC (rev 4250) @@ -827,9 +827,8 @@ if (SeesObject(nearobj, range)) { - //CPrintf(CON_SPAM, " and is seen.\n"); #ifdef PSPROXDEBUG - log.AppendFmt("-%s (client %i) can see %s\n",GetName(),GetClientID(),nearobj->GetName()); + log.AppendFmt(" and is seen.\n-%s (client %i) can see %s\n",GetName(),GetClientID(),nearobj->GetName()); #endif if (proxlist->StartWatching(nearobj, range) || force) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-08-28 19:32:54
|
Revision: 4274 http://planeshift.svn.sourceforge.net/planeshift/?rev=4274&view=rev Author: kennygraunke Date: 2009-08-28 19:32:47 +0000 (Fri, 28 Aug 2009) Log Message: ----------- Initialize character mode earlier so it's set by the time psCharacterInventory tries to use it. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-08-28 17:06:52 UTC (rev 4273) +++ trunk/src/server/gem.cpp 2009-08-28 19:32:47 UTC (rev 4274) @@ -1915,6 +1915,11 @@ return; } + player_mode = PSCHARACTER_MODE_PEACE; + if (psChar->IsStatue()) + player_mode = PSCHARACTER_MODE_STATUE; + combat_stance = CombatManager::GetStance("None"); + this->factname.SetActor(this); Debug6(LOG_NPC,0,"Successfully created actor %s at %1.2f,%1.2f,%1.2f in sector %s.\n", @@ -1926,11 +1931,6 @@ UpdateValidLocation(pos, rotangle, GetSector(), myInstance, true); GetCharacterData()->SetStaminaRegenerationStill(); - - player_mode = PSCHARACTER_MODE_PEACE; - if (psChar->IsStatue()) - player_mode = PSCHARACTER_MODE_STATUE; - combat_stance = CombatManager::GetStance("None"); } gemActor::~gemActor() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-09-10 15:26:16
|
Revision: 4343 http://planeshift.svn.sourceforge.net/planeshift/?rev=4343&view=rev Author: weltall2 Date: 2009-09-10 15:26:10 +0000 (Thu, 10 Sep 2009) Log Message: ----------- fix for unmount Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-09-10 14:12:46 UTC (rev 4342) +++ trunk/src/server/gem.cpp 2009-09-10 15:26:10 UTC (rev 4343) @@ -3585,6 +3585,9 @@ gemActor* activeActor = dynamic_cast<gemActor*>(actor); if (activeActor && activeActor->GetClientID() != 0) { + if(activeActor->GetMount() && this == actor) + options |= psGUIInteractMessage::UNMOUNT; + if ( (activeActor->GetMode() == PSCHARACTER_MODE_PEACE || activeActor->GetMode() == PSCHARACTER_MODE_SIT) && this != activeActor ) options |= psGUIInteractMessage::EXCHANGE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-09-15 01:46:23
|
Revision: 4360 http://planeshift.svn.sourceforge.net/planeshift/?rev=4360&view=rev Author: kennygraunke Date: 2009-09-15 01:46:16 +0000 (Tue, 15 Sep 2009) Log Message: ----------- Remove 'force' parameter on UpdateProxList call in gemActor::Teleport. If position is all that changed, there shouldn't be a need to forcibly resend the actor. This should make /slide and /teleport a lot more efficient. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-09-14 21:58:45 UTC (rev 4359) +++ trunk/src/server/gem.cpp 2009-09-15 01:46:16 UTC (rev 4360) @@ -3086,7 +3086,7 @@ if (GetClient()) GetClient()->SetCheatMask(MOVE_CHEAT, true); // Tell paladin one of these is OK. - UpdateProxList(true); + UpdateProxList(); MulticastDRUpdate(); ForcePositionUpdate(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-18 08:59:36
|
Revision: 4422 http://planeshift.svn.sourceforge.net/planeshift/?rev=4422&view=rev Author: mgist Date: 2009-09-18 08:59:30 +0000 (Fri, 18 Sep 2009) Log Message: ----------- - Fix. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-09-18 08:39:34 UTC (rev 4421) +++ trunk/src/server/gem.cpp 2009-09-18 08:59:30 UTC (rev 4422) @@ -4375,6 +4375,7 @@ name, guildName, factname.Current(), + matname, psChar->GetRaceInfo()->name, GetMount() ? GetMount()->GetRaceInfo()->mesh_name : "null", psChar->GetRaceInfo()->gender, 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:43:18
|
Revision: 4429 http://planeshift.svn.sourceforge.net/planeshift/?rev=4429&view=rev Author: mgist Date: 2009-09-18 11:43:11 +0000 (Fri, 18 Sep 2009) Log Message: ----------- - Fix. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-09-18 11:41:10 UTC (rev 4428) +++ trunk/src/server/gem.cpp 2009-09-18 11:43:11 UTC (rev 4429) @@ -3066,7 +3066,7 @@ void gemActor::Teleport(const char *sectorName, const csVector3 & pos, float yrot, InstanceID instance) { csRef<iEngine> engine = csQueryRegistry<iEngine>(psserver->GetObjectReg()); - iSector *sector = engine->GetSectors()->FindByName(sectorName); + iSector *sector = engine->GetSectors()->FindByName(csString(sectorName).Downcase()); if (!sector) { Bug2("Sector %s is not found!", sectorName); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ken...@us...> - 2009-09-23 09:05:24
|
Revision: 4496 http://planeshift.svn.sourceforge.net/planeshift/?rev=4496&view=rev Author: kennygraunke Date: 2009-09-23 09:05:17 +0000 (Wed, 23 Sep 2009) Log Message: ----------- - Remove pointless Unbox() calls - the value was immediately reboxed. (Please don't unbox values unless you really need the raw integer.) Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-09-23 08:59:53 UTC (rev 4495) +++ trunk/src/server/gem.cpp 2009-09-23 09:05:17 UTC (rev 4496) @@ -2603,7 +2603,7 @@ pcmove, movementMode, GetMode(), - (to_superclients || allEntities) ? pid.Unbox() : 0, // playerID should not be distributed to clients + (to_superclients || allEntities) ? pid : 0, // playerID should not be distributed to clients groupID, 0, // ownerEID flags @@ -4395,7 +4395,7 @@ pcmove, movementMode, GetMode(), - (to_superclients || allEntities) ? pid.Unbox() : 0, // playerID should not be distributed to clients + (to_superclients || allEntities) ? pid : 0, // playerID should not be distributed to clients 0, // groupID ownerEID, flags This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-09-23 15:40:43
|
Revision: 4505 http://planeshift.svn.sourceforge.net/planeshift/?rev=4505&view=rev Author: weltall2 Date: 2009-09-23 15:40:36 +0000 (Wed, 23 Sep 2009) Log Message: ----------- crash fix Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-09-23 15:34:01 UTC (rev 4504) +++ trunk/src/server/gem.cpp 2009-09-23 15:40:36 UTC (rev 4505) @@ -1247,7 +1247,7 @@ psserver->GetCharManager()->UpdateItemViews(clientnum); - if(item) GEMSupervisor::GetSingleton().RemoveItemEntity(dynamic_cast<gemItem*>(this)); + if(dynamic_cast<gemItem*>(this)->GetItem()) GEMSupervisor::GetSingleton().RemoveItemEntity(dynamic_cast<gemItem*>(this)); EntityManager::GetSingleton().RemoveActor(this); // Destroy this } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-10-23 07:43:10
|
Revision: 4671 http://planeshift.svn.sourceforge.net/planeshift/?rev=4671&view=rev Author: weltall2 Date: 2009-10-23 07:42:59 +0000 (Fri, 23 Oct 2009) Log Message: ----------- fixed crash. Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-10-23 06:54:09 UTC (rev 4670) +++ trunk/src/server/gem.cpp 2009-10-23 07:42:59 UTC (rev 4671) @@ -4020,7 +4020,8 @@ if (last_response != -1) // within a quest step { resp = dict->FindResponse(last_response); - menu.Add(resp->menu); + if(resp) //TODO: this happens needs some investigation on the reason + menu.Add(resp->menu); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-10-23 07:52:42
|
Revision: 4672 http://planeshift.svn.sourceforge.net/planeshift/?rev=4672&view=rev Author: weltall2 Date: 2009-10-23 07:52:32 +0000 (Fri, 23 Oct 2009) Log Message: ----------- added error output Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-10-23 07:42:59 UTC (rev 4671) +++ trunk/src/server/gem.cpp 2009-10-23 07:52:32 UTC (rev 4672) @@ -4022,6 +4022,8 @@ resp = dict->FindResponse(last_response); if(resp) //TODO: this happens needs some investigation on the reason menu.Add(resp->menu); + else + Error4("BUG: resp was null! last_response %d in %s (%c)", last_response, quests[i]->GetQuest()->GetName(), quests[i]->status); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-11-21 08:08:01
|
Revision: 4765 http://planeshift.svn.sourceforge.net/planeshift/?rev=4765&view=rev Author: weltall2 Date: 2009-11-21 08:07:47 +0000 (Sat, 21 Nov 2009) Log Message: ----------- fixed PS#3144 - owned character stats stops being delivered on teleport Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-11-21 07:50:19 UTC (rev 4764) +++ trunk/src/server/gem.cpp 2009-11-21 08:07:47 UTC (rev 4765) @@ -3092,6 +3092,7 @@ UpdateProxList(); MulticastDRUpdate(); ForcePositionUpdate(); + BroadcastTargetStatDR(EntityManager::GetSingleton().GetClients()); //we need to update the stats too } void gemActor::SetPosition(const csVector3& pos,float angle, iSector* sector) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-11-21 16:16:24
|
Revision: 4766 http://planeshift.svn.sourceforge.net/planeshift/?rev=4766&view=rev Author: weltall2 Date: 2009-11-21 16:16:17 +0000 (Sat, 21 Nov 2009) Log Message: ----------- fix issue showing wrong windows Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-11-21 08:07:47 UTC (rev 4765) +++ trunk/src/server/gem.cpp 2009-11-21 16:16:17 UTC (rev 4766) @@ -4118,7 +4118,9 @@ // Mine? for now bypass if (true) //(psChar->GetOwnerID() == actor->GetCharacterData()->GetPID()) { - options |= psGUIInteractMessage::VIEWSTATS; + //bypass viewstat for now as mounts aren't owned + //options |= psGUIInteractMessage::VIEWSTATS; + options |= psGUIInteractMessage::PLAYERDESC; if(actor->GetMount()) options |= psGUIInteractMessage::UNMOUNT; else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-13 07:29:02
|
Revision: 4956 http://planeshift.svn.sourceforge.net/planeshift/?rev=4956&view=rev Author: weltall2 Date: 2009-12-13 07:28:54 +0000 (Sun, 13 Dec 2009) Log Message: ----------- fixed npc stance Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-12-13 06:13:53 UTC (rev 4955) +++ trunk/src/server/gem.cpp 2009-12-13 07:28:54 UTC (rev 4956) @@ -3881,6 +3881,8 @@ //} pcmove->SetOnGround(true); + + combat_stance = CombatManager::GetStance("Normal"); if (chardata->GetOwnerID().IsValid()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-13 08:52:30
|
Revision: 4958 http://planeshift.svn.sourceforge.net/planeshift/?rev=4958&view=rev Author: weltall2 Date: 2009-12-13 08:52:22 +0000 (Sun, 13 Dec 2009) Log Message: ----------- fixed a server crash. there is something strange with these targets... Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-12-13 08:36:09 UTC (rev 4957) +++ trunk/src/server/gem.cpp 2009-12-13 08:52:22 UTC (rev 4958) @@ -2370,7 +2370,7 @@ // if damage due to spell then spell is ending anyway, so no need to force // 'stop attack.' if (attacker && attacker->GetMode() == PSCHARACTER_MODE_COMBAT && - attacker->GetClient()->GetTargetObject() == this) + (attacker->GetClient() || attacker->GetTargetObject() == this)) { psserver->combatmanager->StopAttack(attacker); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-13 08:53:32
|
Revision: 4959 http://planeshift.svn.sourceforge.net/planeshift/?rev=4959&view=rev Author: weltall2 Date: 2009-12-13 08:53:24 +0000 (Sun, 13 Dec 2009) Log Message: ----------- missing one thing Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2009-12-13 08:52:22 UTC (rev 4958) +++ trunk/src/server/gem.cpp 2009-12-13 08:53:24 UTC (rev 4959) @@ -2370,7 +2370,7 @@ // if damage due to spell then spell is ending anyway, so no need to force // 'stop attack.' if (attacker && attacker->GetMode() == PSCHARACTER_MODE_COMBAT && - (attacker->GetClient() || attacker->GetTargetObject() == this)) + (attacker->GetClient() || attacker->->GetClient()->GetTargetObject() == this)) { psserver->combatmanager->StopAttack(attacker); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |