Browse Source

Fix a few issues with more strict modern compilers

(cherry picked from commit ecb7d8b566)
rarified/huru-merge-work/code-cleanup
Zrax 13 years ago committed by rarified
parent
commit
951011d903
  1. 2
      Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp
  2. 3
      Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h

2
Sources/Plasma/FeatureLib/pfPython/cyAccountManagement.cpp

@ -67,7 +67,7 @@ PyObject* cyAccountManagement::GetPlayerList()
for (int i = 0; i < numPlayers; ++i)
{
PyObject* playerTuple = PyTuple_New(3);
PyObject* playerName = PyUnicode_FromUnicode(playerList[i].playerName, wcslen(playerList[i].playerName));
PyObject* playerName = PyUnicode_FromUnicode((const Py_UNICODE*)playerList[i].playerName, wcslen(playerList[i].playerName));
PyObject* playerId = PyInt_FromLong(playerList[i].playerInt);
PyObject* avatarShape = PyString_FromString(playerList[i].avatarDatasetName);

3
Sources/Plasma/PubUtilLib/plNetClient/plNetClientGroup.h

@ -100,8 +100,9 @@ public:
std::set<OwnedGroup>::iterator it=IFind(grpId);
if (it != fGroups.end())
{
OwnedGroup grp(it->fGroup, it->fOwnIt);
fGroups.erase(it);
fGroups.insert(OwnedGroup(grpId, ownIt));
fGroups.insert(grp);
}
else
{

Loading…
Cancel
Save