From: <wel...@us...> - 2010-03-22 12:56:03
|
Revision: 5726 http://planeshift.svn.sourceforge.net/planeshift/?rev=5726&view=rev Author: weltall2 Date: 2010-03-22 12:55:55 +0000 (Mon, 22 Mar 2010) Log Message: ----------- made also death sector moved to database Modified Paths: -------------- trunk/src/server/gem.cpp Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2010-03-21 17:47:59 UTC (rev 5725) +++ trunk/src/server/gem.cpp 2010-03-22 12:55:55 UTC (rev 5726) @@ -2295,14 +2295,22 @@ } else { - // TODO: Get Death Realm location from db somewhere - Teleport("DR01", csVector3(-29.2f, -119.0f, 28.2f), 0.0f, DEFAULT_INSTANCE); + float x,y,z,yrot; + optionEntry* deathentry = CacheManager::GetSingleton().getOptionSafe("death",""); + csString sectorName = deathentry->getOptionSafe("sectorname", "DR01")->getValue(); + x = deathentry->getOptionSafe("sectorx", "-29.2")->getValueAsDouble(); + y = deathentry->getOptionSafe("sectory", "-119.0")->getValueAsDouble(); + z = deathentry->getOptionSafe("sectorz", "28.2")->getValueAsDouble(); + yrot = deathentry->getOptionSafe("sectoryrot", "0.0")->getValueAsDouble(); + Teleport(sectorName, csVector3(x, y, z), yrot, DEFAULT_INSTANCE); } psChar->SetHitPoints(psChar->GetMaxHP().Base()); + //TODO: better if it's moved to the sector table + csString sectorName = CacheManager::GetSingleton().getOptionSafe("death:sectorname", "DR01")->getValue(); //Do not reset mana to max while in DR, to prevent exploits using /die - if (sector && strncmp ("DR", sector->QueryObject()->GetName(), 2)) + if (sector && strncmp (sectorName.GetData(), sector->QueryObject()->GetName(), 2)) psChar->SetMana(psChar->GetMaxMana().Base()); psChar->SetStamina(psChar->GetMaxPStamina().Base(), true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |