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

Set camera position on LoadCurrentMap

Browse source
This commit is contained in:
Andrii 2020-05-15 17:29:09 +03:00 committed by heinrich5991
parent e1828b88ab
commit ab79036873
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/game/editor/editor.cpp
View file

@ -21,6 +21,8 @@
#include <engine/storage.h>
#include <engine/textrender.h>
#include <game/client/gameclient.h>
#include <game/client/components/camera.h>
#include <game/gamecore.h>
#include <game/localization.h>
#include <game/client/lineinput.h>
@ -208,7 +210,7 @@ void CLayerGroup::Render()
void CLayerGroup::AddLayer(CLayer *l)
{
m_pMap->m_Modified = true;
m_pMap->m_Modified = true;
m_lLayers.add(l);
}
@ -6325,6 +6327,18 @@ void CEditor::UpdateAndRender()
Input()->Clear();
}
void CEditor::LoadCurrentMap()
{
Load(m_pClient->GetCurrentMapPath(), IStorage::TYPE_ALL);
m_ValidSaveFilename = true;
CGameClient* gameClient = (CGameClient*)Kernel()->RequestInterface<IGameClient>();
vec2 center = gameClient->m_pCamera->m_Center;
m_WorldOffsetX = center.x;
m_WorldOffsetY = center.y;
}
IEditor *CreateEditor() { return new CEditor; }
// DDRace
@ -6363,3 +6377,4 @@ void CEditorMap::MakeTuneLayer(CLayer *pLayer)
m_pTuneLayer->m_pEditor = m_pEditor;
m_pTuneLayer->m_Texture = m_pEditor->m_TuneTexture;
}

6
src/game/editor/io.cpp
View file

@ -567,12 +567,6 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName)
return 1;
}
void CEditor::LoadCurrentMap()
{
Load(m_pClient->GetCurrentMapPath(), IStorage::TYPE_ALL);
m_ValidSaveFilename = true;
}
int CEditor::Load(const char *pFileName, int StorageType)
{
Reset();