edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Client: Support .map file drag-and-drop to open map in editor

Browse source 
As suggested by Lady Saavik
This commit is contained in:
def 2020-08-02 13:00:01 +02:00
parent 4873536d93
commit 07f18d4ac4
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/client/client.cpp
View file

@ -3012,6 +3012,17 @@ void CClient::Run()
m_aCmdPlayDemo[0] = 0;
}
// handle pending map edits
if(m_aCmdEditMap[0])
{
int Result = m_pEditor->Load(m_aCmdEditMap, IStorage::TYPE_ABSOLUTE);
if(Result)
g_Config.m_ClEditor = true;
else
dbg_msg("demo_player", "editing passed map file '%s' failed", m_aCmdEditMap);
m_aCmdEditMap[0] = 0;
}
// progress on dummy connect if security token handshake skipped/passed
if(m_DummySendConnInfo && !m_NetClient[CLIENT_DUMMY].SecurityTokenUnknown())
{
@ -3987,6 +3998,11 @@ void CClient::HandleDemoPath(const char *pPath)
str_copy(m_aCmdPlayDemo, pPath, sizeof(m_aCmdPlayDemo));
}
void CClient::HandleMapPath(const char *pPath)
{
str_copy(m_aCmdEditMap, pPath, sizeof(m_aCmdEditMap));
}
/*
Server Time
Client Mirror Time
@ -4137,6 +4153,8 @@ int main(int argc, const char **argv) // ignore_convention
pClient->HandleConnectLink(argv[1]);
else if(argc == 2 && str_endswith(argv[1], ".demo"))
pClient->HandleDemoPath(argv[1]);
else if(argc == 2 && str_endswith(argv[1], ".map"))
pClient->HandleMapPath(argv[1]);
else if(argc > 1) // ignore_convention
pConsole->ParseArguments(argc-1, &argv[1]); // ignore_convention

2
src/engine/client/client.h
View file

@ -150,6 +150,7 @@ class CClient : public IClient, public CDemoPlayer::IListener
//
char m_aCmdConnect[256];
char m_aCmdPlayDemo[MAX_PATH_LENGTH];
char m_aCmdEditMap[MAX_PATH_LENGTH];
// map download
std::shared_ptr<CGetFile> m_pMapdownloadTask;
@ -422,6 +423,7 @@ public:
void HandleConnectLink(const char *pLink);
void HandleDemoPath(const char *pPath);
void HandleMapPath(const char *pPath);
// gfx
void SwitchWindowScreen(int Index);