1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00

Fix a few issues with more strict modern compilers

This commit is contained in:
2011-04-06 19:44:10 -07:00
parent 53d629bf83
commit ecb7d8b566
4 changed files with 11 additions and 4 deletions

View File

@ -51,7 +51,7 @@ PyObject* cyAccountManagement::GetPlayerList()
for (int i = 0; i < numPlayers; ++i) for (int i = 0; i < numPlayers; ++i)
{ {
PyObject* playerTuple = PyTuple_New(3); 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* playerId = PyInt_FromLong(playerList[i].playerInt);
PyObject* avatarShape = PyString_FromString(playerList[i].avatarDatasetName); PyObject* avatarShape = PyString_FromString(playerList[i].avatarDatasetName);

View File

@ -202,8 +202,8 @@ void plAgeDescription::SetAgeNameFromPath( const char *path )
} }
// Construct our name from the path // Construct our name from the path
char *pathSep1 = strrchr( path, '\\' ); const char *pathSep1 = strrchr( path, '\\' );
char *pathSep2 = strrchr( path, '/' ); const char *pathSep2 = strrchr( path, '/' );
if( pathSep2 > pathSep1 ) if( pathSep2 > pathSep1 )
pathSep1 = pathSep2; pathSep1 = pathSep2;
if( pathSep1 == nil ) if( pathSep1 == nil )

View File

@ -145,6 +145,9 @@ protected:
plSimulationInterface * IGetSI(const plAGModifier *modifier) const; plSimulationInterface * IGetSI(const plAGModifier *modifier) const;
plObjInterface * IGetGI(const plAGModifier *modifier, UInt16 classIdx) const; plObjInterface * IGetGI(const plAGModifier *modifier, UInt16 classIdx) const;
// Allow plAGModifier to declare IGet?? as friends
friend class plAGModifier;
// -- members -- // -- members --
plAGChannel *fChannel; plAGChannel *fChannel;
hsBool fEnabled; hsBool fEnabled;

View File

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