games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Removed some SDL access from non-SDL code

Browse Source
This commit is contained in:
Ivan Savenko
2023-02-02 18:35:01 +02:00
parent e1bd0d2a04
commit b1821d4442
5 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/CServerHandler.cpp
View File

@@ -60,8 +60,6 @@
#include <windows.h>
#endif
#include <SDL_events.h>
template<typename T> class CApplyOnLobby;
const std::string CServerHandler::localhostAddress{"127.0.0.1"};
@@ -655,14 +653,10 @@ void CServerHandler::endGameplay(bool closeConnection, bool restart)
void CServerHandler::startCampaignScenario(std::shared_ptr<CCampaignState> cs)
{
SDL_Event event;
event.type = SDL_USEREVENT;
event.user.code = static_cast<int32_t>(EUserEvent::CAMPAIGN_START_SCENARIO);
if(cs)
event.user.data1 = CMemorySerializer::deepCopy(*cs.get()).release();
GH.pushUserEvent(EUserEvent::CAMPAIGN_START_SCENARIO, CMemorySerializer::deepCopy(*cs.get()).release());
else
event.user.data1 = CMemorySerializer::deepCopy(*si->campState.get()).release();
SDL_PushEvent(&event);
GH.pushUserEvent(EUserEvent::CAMPAIGN_START_SCENARIO, CMemorySerializer::deepCopy(*si->campState.get()).release());
}
void CServerHandler::showServerError(std::string txt)