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

Editor: used max int value for goto min and max coordinates

Browse source
This commit is contained in:
Corantin H 2022-09-15 19:31:56 +02:00
parent d81f15181e
commit e52e443988
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/game/editor/popups.cpp
View file

@ -9,6 +9,7 @@
#include <engine/keys.h> #include <engine/keys.h>
#include <engine/shared/config.h> #include <engine/shared/config.h>
#include <engine/storage.h> #include <engine/storage.h>
#include <limits>
#include "editor.h" #include "editor.h"
@ -1782,14 +1783,6 @@ int CEditor::PopupGoto(CEditor *pEditor, CUIRect View, void *pContext)
View.HSplitMid(&CoordXPicker, &CoordYPicker); View.HSplitMid(&CoordXPicker, &CoordYPicker);
CoordXPicker.VSplitRight(2.f, &CoordXPicker, nullptr); CoordXPicker.VSplitRight(2.f, &CoordXPicker, nullptr);
int MaxX = pEditor->m_Map.m_pGameLayer->m_Width - 1;
int MaxY = pEditor->m_Map.m_pGameLayer->m_Height - 1;
if(pEditor->m_GotoX > MaxX)
pEditor->m_GotoX = MaxX;
if(pEditor->m_GotoY > MaxY)
pEditor->m_GotoY = MaxY;
static ColorRGBA s_Color = ColorRGBA(1, 1, 1, 0.5f); static ColorRGBA s_Color = ColorRGBA(1, 1, 1, 0.5f);
enum enum
@ -1800,8 +1793,8 @@ int CEditor::PopupGoto(CEditor *pEditor, CUIRect View, void *pContext)
}; };
CProperty aProps[] = { CProperty aProps[] = {
{"X", pEditor->m_GotoX, PROPTYPE_INT_STEP, 0, MaxX}, {"X", pEditor->m_GotoX, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
{"Y", pEditor->m_GotoY, PROPTYPE_INT_STEP, 0, MaxY}, {"Y", pEditor->m_GotoY, PROPTYPE_INT_STEP, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()},
{nullptr}, {nullptr},
}; };