swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-28 23:16:15 -04:00
Code Issues Projects Releases Wiki Activity

Minor fixes including removing <> from make_pair usage and using explicit conversions where required by the explicit constructor flags

Browse Source 
Now builds/runs using c++11
This commit is contained in:
Anonymous
2014-01-23 08:55:46 -07:00
parent fabe85739d
commit e6431a9fd4
14 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp
+2 -2
View File
@@ -6543,7 +6543,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env
{
SlottedContainmentProperty::SlotArrangement const slots = slottedContainment->getSlotArrangement(slottedContainment->getCurrentArrangement()); // Get the old arrangement
for(unsigned int j = 0; j < slots.size(); ++j)
wornObjects.insert(std::make_pair<SlotId, const ServerObject*>(slots[j], item));
wornObjects.insert(std::make_pair(slots[j], item));
}
}
}
@@ -6586,7 +6586,7 @@ jlongArray JNICALL ScriptMethodsObjectInfoNamespace::getAllWornItems(JNIEnv *env
if(!slotOccupied)
{
for(unsigned int j = 0; j < slots.size(); ++j)
wornObjects.insert(std::make_pair<SlotId, const ServerObject*>(slots[j], item));
wornObjects.insert(std::make_pair(slots[j], item));
}
}
}