OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

More minGW fixes.

Darryl Pogue 13 years ago
parent
a6cadfa403
commit
c815fd8a14
6 changed files with 22 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h
  2. 2
      Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
  3. 24
      Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp
  4. 2
      Sources/Plasma/PubUtilLib/plNetGameLib/Intern.h
  5. 2
      Sources/Plasma/PubUtilLib/plPipeline/hsFogControl.h
  6. 4
      Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp

2
Sources/Plasma/FeatureLib/pfMessage/pfMessageCreatable.h
Unescape View File

@ -99,4 +99,4 @@ REGISTER_CREATABLE(pfBackdoorMsg);
REGISTER_CREATABLE(pfMovieEventMsg);
#endif pfMessageCreatable_inc
#endif //pfMessageCreatable_inc

2
Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
Unescape View File

@ -295,7 +295,7 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
break;
BYTE scan = (BYTE)(Lparam >> 16);
UINT vkey = MapVirtualKey(scan, MAPVK_VSC_TO_VK);
UINT vkey = MapVirtualKey(scan, 1); //MAPVK_VSC_TO_VK
bExtended = Lparam >> 24 & 1;
hsBool bRepeat = ((Lparam >> 29) & 0xf) != 0;

24
Sources/Plasma/PubUtilLib/plInputCore/plSceneInputInterface.cpp
Unescape View File

@ -608,7 +608,8 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
if (fBookMode == kBookOffered)
{
// and put our own dialog back up...
ISendOfferNotification(plNetClientMgr::GetInstance()->GetLocalPlayerKey(), 0, false);
plKey avKey = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
ISendOfferNotification(avKey, 0, false);
//IManageIgnoredAvatars(fOffereeKey, false);
fOffereeKey = nil;
fBookMode = kNotOffering;
@ -627,7 +628,8 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
// tell them to ignore us
plInputIfaceMgrMsg* pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
pMsg->SetAvKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
plKey avKey = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
pMsg->SetAvKey(avKey);
pMsg->SetBCastFlag(plMessage::kNetPropagate);
pMsg->SetBCastFlag(plMessage::kNetForce);
pMsg->SetBCastFlag(plMessage::kLocalPropagate, false);
@ -754,7 +756,8 @@ hsBool plSceneInputInterface::MsgReceive( plMessage *msg )
if (fBookMode == kBookOffered)
{
// and put our own dialog back up...
ISendOfferNotification(plNetClientMgr::GetInstance()->GetLocalPlayerKey(), 0, false);
plKey avKey = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
ISendOfferNotification(avKey, 0, false);
//IManageIgnoredAvatars(fOffereeKey, false);
fBookMode = kOfferBook;
fOffereeKey = nil;
@ -830,7 +833,8 @@ void plSceneInputInterface::ILinkOffereeToAge()
else if (!VaultGetOwnedAgeLink(&info, &link)) {
// We must have an owned copy of the age before we can offer it, so make one now
info.SetAgeInstanceGuid(&plUUID(GuidGenerate()));
plUUID guid(GuidGenerate());
info.SetAgeInstanceGuid(&guid);
std::string title;
std::string desc;
@ -858,7 +862,8 @@ void plSceneInputInterface::ILinkOffereeToAge()
VaultAgeLinkNode linkAcc(linkNode);
if (linkAcc.volat) {
if (VaultUnregisterOwnedAgeAndWait(link.GetAgeInfo())) {
link.GetAgeInfo()->SetAgeInstanceGuid(&plUUID(GuidGenerate()));
plUUID guid(GuidGenerate());
link.GetAgeInfo()->SetAgeInstanceGuid(&guid);
VaultRegisterOwnedAgeAndWait(&link);
}
}
@ -882,7 +887,8 @@ void plSceneInputInterface::ILinkOffereeToAge()
if (!fPendingLink && stricmp(fOfferedAgeFile, kPersonalAgeFilename))
{
// tell our local dialog to pop up again...
ISendOfferNotification(plNetClientMgr::GetInstance()->GetLocalPlayerKey(), 0, false);
plKey avKey = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
ISendOfferNotification(avKey, 0, false);
// make them clickable again(in case they come back?)
//IManageIgnoredAvatars(fOffereeKey, false);
@ -1041,7 +1047,8 @@ hsBool plSceneInputInterface::InterpretInputEvent( plInputEventMsg *pMsg )
{
// and put our own dialog back up...
ISendOfferNotification(fOffereeKey, -999, true);
ISendOfferNotification(plNetClientMgr::GetInstance()->GetLocalPlayerKey(), 0, false);
plKey avKey = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
ISendOfferNotification(avKey, 0, false);
//IManageIgnoredAvatars(fOffereeKey, false);
fBookMode = kOfferBook;
fOffereeKey = nil;
@ -1138,7 +1145,8 @@ void plSceneInputInterface::ISendAvatarDisabledNotification(hsBool enabled)
pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kEnableAvatarClickable);
else
pMsg = new plInputIfaceMgrMsg(plInputIfaceMgrMsg::kDisableAvatarClickable);
pMsg->SetAvKey(plNetClientMgr::GetInstance()->GetLocalPlayerKey());
plKey avKey = plNetClientMgr::GetInstance()->GetLocalPlayerKey();
pMsg->SetAvKey(avKey);
pMsg->SetBCastFlag(plMessage::kNetPropagate);
pMsg->SetBCastFlag(plMessage::kNetForce);
pMsg->SetBCastFlag(plMessage::kLocalPropagate, false);

2
Sources/Plasma/PubUtilLib/plNetGameLib/Intern.h
Unescape View File

@ -225,7 +225,7 @@ enum ETransType {
kNumTransTypes
};
static char * s_transTypes[] = {
static const char * s_transTypes[] = {
// NglAuth.cpp
"PingRequestTrans",
"LoginRequestTrans",

2
Sources/Plasma/PubUtilLib/plPipeline/hsFogControl.h
Unescape View File

@ -148,4 +148,4 @@ public:
};
#endif // Move up to FeatureLevel
#endif hsFogControl_inc
#endif //hsFogControl_inc

4
Sources/Plasma/PubUtilLib/plStatGather/plProfileManagerFull.cpp
Unescape View File

@ -443,7 +443,7 @@ const wchar_t* plProfileManagerFull::GetProfilePath()
plFileUtils::CreateDir(profilePath);
wchar_t buff[256];
swprintf(buff, 256, L"%02d-%02d-%04d_%02d-%02d//",
hsSnwprintf(buff, 256, L"%02d-%02d-%04d_%02d-%02d//",
curTime.GetMonth(),
curTime.GetDay(),
curTime.GetYear(),
@ -460,7 +460,7 @@ const wchar_t* plProfileManagerFull::GetProfilePath()
void plProfileManagerFull::ILogStats()
{
wchar_t statFilename[256];
swprintf(statFilename, 256, L"%s%s.csv", GetProfilePath(), fLogAgeName.c_str());
hsSnwprintf(statFilename, 256, L"%s%s.csv", GetProfilePath(), fLogAgeName.c_str());
bool exists = plFileUtils::FileExists(statFilename);

Write Preview
Loading…
Cancel
Save