ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix for constexpr vars that conflicted with some win macros.

This commit is contained in:
harry 2024-03-24 16:29:13 -04:00
parent bed9b10380
commit 450870ef77
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/drivers/Qt/NetPlay.cpp
View File

@ -563,8 +563,8 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
if (!version_chk_ok) if (!version_chk_ok)
{ {
netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG); netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG);
errorMsg.setFlag(netPlayTextMsgFlags::DISCONNECT); errorMsg.setFlag(netPlayTextMsgFlags::Disconnect);
errorMsg.setFlag(netPlayTextMsgFlags::ERROR); errorMsg.setFlag(netPlayTextMsgFlags::Error);
errorMsg.printf("Client/Host Version Mismatch:\nHost version is %i.%i.%i\nClient version is %i.%i.%i", errorMsg.printf("Client/Host Version Mismatch:\nHost version is %i.%i.%i\nClient version is %i.%i.%i",
FCEU_VERSION_MAJOR, FCEU_VERSION_MINOR, FCEU_VERSION_PATCH, FCEU_VERSION_MAJOR, FCEU_VERSION_MINOR, FCEU_VERSION_PATCH,
msg->appVersionMajor, msg->appVersionMinor, msg->appVersionPatch); msg->appVersionMajor, msg->appVersionMinor, msg->appVersionPatch);
@ -582,8 +582,8 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
if (!authentication_passed) if (!authentication_passed)
{ {
netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG); netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG);
errorMsg.setFlag(netPlayTextMsgFlags::DISCONNECT); errorMsg.setFlag(netPlayTextMsgFlags::Disconnect);
errorMsg.setFlag(netPlayTextMsgFlags::ERROR); errorMsg.setFlag(netPlayTextMsgFlags::Error);
errorMsg.printf("Invalid Password"); errorMsg.printf("Invalid Password");
sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } ); sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } );
client->flushData(); client->flushData();
@ -605,8 +605,8 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
else else
{ {
netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG); netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG);
errorMsg.setFlag(netPlayTextMsgFlags::DISCONNECT); errorMsg.setFlag(netPlayTextMsgFlags::Disconnect);
errorMsg.setFlag(netPlayTextMsgFlags::ERROR); errorMsg.setFlag(netPlayTextMsgFlags::Error);
errorMsg.printf("Player %i role is not available", msg->playerId+1); errorMsg.printf("Player %i role is not available", msg->playerId+1);
sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } ); sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } );
client->flushData(); client->flushData();
@ -641,7 +641,7 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
bool opsSync = (data.opsCrc32 == msg->opsChkSum); bool opsSync = (data.opsCrc32 == msg->opsChkSum);
bool ramSync = (data.ramCrc32 == msg->ramChkSum); bool ramSync = (data.ramCrc32 == msg->ramChkSum);
client->syncOk = opsSync && ramSync; client->syncOk = client->romMatch && opsSync && ramSync;
if (!client->syncOk) if (!client->syncOk)
{ {
@ -737,7 +737,7 @@ void NetPlayServer::serverProcessMessage( NetPlayClient *client, void *msgBuf, s
else else
{ {
netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG); netPlayTextMsg<128> errorMsg(NETPLAY_ERROR_MSG);
errorMsg.setFlag(netPlayTextMsgFlags::WARNING); errorMsg.setFlag(netPlayTextMsgFlags::Warning);
errorMsg.printf("Host is rejected ROMs load request"); errorMsg.printf("Host is rejected ROMs load request");
sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } ); sendMsg( client, &errorMsg, errorMsg.hdr.msgSize, [&errorMsg]{ errorMsg.toNetworkByteOrder(); } );
} }
@ -1433,7 +1433,7 @@ void NetPlayClient::clientProcessMessage( void *msgBuf, size_t msgSize )
msg->toHostByteOrder(); msg->toHostByteOrder();
FCEU_printf("NetPlay Info: %s\n", msg->getBuffer()); FCEU_printf("NetPlay Info: %s\n", msg->getBuffer());
if (msg->isFlagSet(netPlayTextMsgFlags::DISCONNECT)) if (msg->isFlagSet(netPlayTextMsgFlags::Disconnect))
{ {
sock->disconnectFromHost(); sock->disconnectFromHost();
} }
@ -1450,7 +1450,7 @@ void NetPlayClient::clientProcessMessage( void *msgBuf, size_t msgSize )
msgBoxTxt += tr(msg->getBuffer()); msgBoxTxt += tr(msg->getBuffer());
QMessageBox::critical( consoleWindow, tr("NetPlay Error"), msgBoxTxt, QMessageBox::Ok ); QMessageBox::critical( consoleWindow, tr("NetPlay Error"), msgBoxTxt, QMessageBox::Ok );
if (msg->isFlagSet(netPlayTextMsgFlags::DISCONNECT)) if (msg->isFlagSet(netPlayTextMsgFlags::Disconnect))
{ {
sock->disconnectFromHost(); sock->disconnectFromHost();
} }

8
src/drivers/Qt/NetPlayMsgDef.h
View File

@ -127,10 +127,10 @@ struct netPlayAuthResp
struct netPlayTextMsgFlags struct netPlayTextMsgFlags
{ {
static const uint32_t DISCONNECT = 0x00000001; static constexpr uint32_t Disconnect = 0x00000001;
static const uint32_t ERROR = 0x00000002; static constexpr uint32_t Error = 0x00000002;
static const uint32_t WARNING = 0x00000004; static constexpr uint32_t Warning = 0x00000004;
static const uint32_t INFO = 0x00000008; static constexpr uint32_t Info = 0x00000008;
}; };
template <size_t N=8> template <size_t N=8>