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

fix for g++:

fix plVault LogMsg calls + remove useless wide char usage
	fix usage of plAvatarMgr::FindAvatar() and plLinkEffectsTriggerMsg::SetLinkKey() with temporary variables
	plNetServerSessionInfo.h need std::string
	fix plProgressMgr.h: NumLoadingFrames() have an useless class context information
	fix plSocket usage of non-standard NULL
This commit is contained in:
Vincent Munsch
2014-04-16 18:13:40 +02:00
parent 683945fb7d
commit a1edba6267
8 changed files with 13 additions and 12 deletions

View File

@ -717,7 +717,7 @@ plArmatureMod *plAvatarMgr::GetFirstRemoteAvatar()
return nil;
}
plArmatureMod* plAvatarMgr::FindAvatar(plKey& avatarKey)
plArmatureMod* plAvatarMgr::FindAvatar(const plKey& avatarKey)
{
plSceneObject *so = plSceneObject::ConvertNoRef(avatarKey->ObjectIsLoaded());
if (so)

View File

@ -141,7 +141,7 @@ public:
plArmatureMod *GetLocalAvatar();
plKey GetLocalAvatarKey();
static plArmatureMod *FindAvatar(plKey& avatarKey); // Key of the sceneObject
static plArmatureMod *FindAvatar(const plKey& avatarKey); // Key of the sceneObject
plArmatureMod *FindAvatarByPlayerID(uint32_t pid);
plArmatureMod *FindAvatarByModelName(const plString& name); // Probably only useful for custom NPCs. All players are
// either "Male" or "Female".