swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-20 10:02:55 -04:00
Code Issues Projects Releases Wiki Activity

potentially breaking: unused vars

Browse Source
This commit is contained in:
DarthArgus
2014-10-26 23:28:34 -07:00
parent 982290924a
commit 4d2287d072
27 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
+1 -1
View File
@@ -9500,7 +9500,7 @@ void CreatureObject::handleCMessageTo(MessageToPayload const &message)
const StringId subject("player_structure", "vendor_purge_warning_subject");
const StringId body("player_structure", "vendor_purge_warning_body");
const Unicode::String mail_subject = Unicode::narrowToWide("@" + subject.getCanonicalRepresentation());
const Unicode::String mail_body = Unicode::narrowToWide("@" + body.getCanonicalRepresentation());
/*const Unicode::String mail_body = Unicode::narrowToWide("@" + body.getCanonicalRepresentation());*/
ProsePackage pp;
pp.stringId = body;
engine/server/library/serverGame/src/shared/object/CreatureObject_Mounts.cpp
+1 -2
View File
@@ -171,8 +171,7 @@ int CreatureObjectNamespace::getSaddleSeatingCapacity(CreatureObject const * con
ServerObject const * const serverObject = mount->asServerObject();
SharedObjectTemplate const * const sharedObjectTemplate = serverObject->getSharedTemplate();
std::string const appearanceFilename = (sharedObjectTemplate != 0) ? sharedObjectTemplate->getAppearanceFilename() : "None";
//std::string const appearanceFilename = (sharedObjectTemplate != 0) ? sharedObjectTemplate->getAppearanceFilename() : "None";
//DEBUG_REPORT_LOG(true, ("sharedObjectTemplate appearanceFilename = '%s'\n", appearanceFilename.c_str()));
}
engine/server/library/serverGame/src/shared/object/HarvesterInstallationObject.cpp
-1
View File
@@ -252,7 +252,6 @@ void HarvesterInstallationObject::selectResource (const NetworkId & resourceType
if (isAuthoritative())
{
bool found=false;
std::vector<NetworkId> pools;
if (!m_survey)
takeSurvey();
engine/server/library/serverGame/src/shared/object/ManufactureSchematicObject.cpp
-2
View File
@@ -1086,7 +1086,6 @@ void ManufactureSchematicObject::addSlotComponent(const StringId & name,
std::vector<int> attribBonuses;
if (component.getAttribBonuses(attribBonuses))
{
const std::string bonusObjVarName(componentCopyName + "." + OBJVAR_ATTRIBUTE_BONUSES);
std::vector<float> componentBonuses(attribBonuses.size());
std::copy(attribBonuses.begin(), attribBonuses.end(), componentBonuses.begin());
setObjVarItem(componentCopyName + "." + OBJVAR_ATTRIBUTE_BONUSES, componentBonuses);
@@ -2485,7 +2484,6 @@ bool ManufactureSchematicObject::setObjectComponents(TangibleObject * object, bo
// check the objects in the schematic volume container to make sure they match
// the ingredients needed
std::vector<ResourceContainerObject *> crateList;
Crafting::IngredientSlot slotData;
ContainerIterator iter;
Crafting::Ingredients::const_iterator ingredientIter;
engine/server/library/serverGame/src/shared/object/PlayerObject.cpp
-1
View File
@@ -1151,7 +1151,6 @@ bool PlayerObject::requestCraftingSession(const NetworkId & toolId)
VolumeContainer const * const inventoryContainer = ContainerInterface::getVolumeContainer(*inventory);
if (inventoryContainer)
{
std::vector<Unicode::String> objList;
for (ContainerConstIterator iter(inventoryContainer->begin()); iter != inventoryContainer->end(); ++iter)
{
CachedNetworkId const & objId = (*iter);
engine/server/library/serverGame/src/shared/object/ServerObject.cpp
-1
View File
@@ -6339,7 +6339,6 @@ void ServerObject::getAttributes(AttributeVector &) const
void ServerObject::getAttributesForAuction(AttributeVector &data) const
{
static const std::string attributeClientSharedTemplateName("ClientSharedTemplateName");
static const std::string attributeAppearanceData("AppearanceData");
DEBUG_FATAL(strlen(getClientSharedTemplateName()) > 1000,("Client shared template name was more than 1000 characters long, too long to save."));