OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Fix several errors and warnings from GCC compilation

Browse Source
This commit is contained in:
Michael Hansen
2012-02-09 00:56:03 -08:00
parent e6ebf7ffaf
commit ad66286a17
78 changed files with 318 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
View File

@ -166,7 +166,7 @@ void plKeyboardDevice::HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDo
{
// update the internal keyboard state
unsigned int keyCode = (unsigned int)key;
if ((key >= 0) && (key < 256))
if (key < 256)
fKeyboardState[key] = bKeyDown;
if (key == KEY_SHIFT)

20
Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp
View File

@ -182,11 +182,11 @@ void plSceneInputInterface::IHalfFadeAvatar(hsBool out)
plIfaceFadeAvatarMsg* pMsg = new plIfaceFadeAvatarMsg();
pMsg->SetSubjectKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
pMsg->SetBCastFlag(plMessage::kBCastByExactType);
pMsg->SetBCastFlag(plMessage::kNetPropagate, FALSE);
pMsg->SetBCastFlag(plMessage::kNetPropagate, false);
pMsg->SetFadeOut(out);
pMsg->Send();
fFadedLocalAvatar = out;
}
@ -270,9 +270,9 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
if (fShowLOS)
{
if (pLOSMsg->fNoHit)
DetectorLogSpecial("%s: LOS miss", pObj->GetKeyName());
DetectorLogSpecial("%s: LOS miss", pObj->GetKeyName().c_str());
else
DetectorLogSpecial("%s: LOS hit", pObj->GetKeyName());
DetectorLogSpecial("%s: LOS hit", pObj->GetKeyName().c_str());
}
int i;
const plInterfaceInfoModifier* pMod = 0;
@ -837,17 +837,17 @@ void plSceneInputInterface::ILinkOffereeToAge()
info.SetAgeInstanceGuid(&guid);
std::string title;
std::string desc;
unsigned nameLen = plNetClientMgr::GetInstance()->GetPlayerName().GetSize();
if (plNetClientMgr::GetInstance()->GetPlayerName().CharAt(nameLen - 1) == 's' || plNetClientMgr::GetInstance()->GetPlayerName().CharAt(nameLen - 1) == 'S') {
xtl::format( title, "%s'", plNetClientMgr::GetInstance()->GetPlayerName() );
xtl::format( desc, "%s' %s", plNetClientMgr::GetInstance()->GetPlayerName(), link.GetAgeInfo()->GetAgeInstanceName() );
xtl::format( title, "%s'", plNetClientMgr::GetInstance()->GetPlayerName().c_str() );
xtl::format( desc, "%s' %s", plNetClientMgr::GetInstance()->GetPlayerName().c_str(), link.GetAgeInfo()->GetAgeInstanceName() );
}
else {
xtl::format( title, "%s's", plNetClientMgr::GetInstance()->GetPlayerName() );
xtl::format( desc, "%s's %s", plNetClientMgr::GetInstance()->GetPlayerName(), link.GetAgeInfo()->GetAgeInstanceName() );
xtl::format( title, "%s's", plNetClientMgr::GetInstance()->GetPlayerName().c_str() );
xtl::format( desc, "%s's %s", plNetClientMgr::GetInstance()->GetPlayerName().c_str(), link.GetAgeInfo()->GetAgeInstanceName() );
}
info.SetAgeUserDefinedName( title.c_str() );
info.SetAgeDescription( desc.c_str() );