- [FIX] Per a crear noves habitacions descartar clicks fora del canvas

- [FIX] Nomes crear nova habitació si s'està pulsant LCTRL
- [NEW] Minimapa en l'editor
This commit is contained in:
2024-07-30 13:01:33 +02:00
parent 8725532586
commit b0dd34b5df
13 changed files with 199 additions and 56 deletions

View File

@@ -19,6 +19,7 @@
#include "m_catslife.h"
#include "m_menu_tecles.h"
#include "m_menu_audio.h"
#include "m_editor_map.h"
#define M_LOGO 0
#define M_MENU 1
@@ -28,6 +29,8 @@
#define M_CATSLIFE 5
#define M_MENU_TECLES 6
#define M_MENU_AUDIO 7
#define M_EDITOR_MAP 8
#define M_EDITOR_TEMPLATES 9
int current_module = M_LOGO;
int zoom = 3;
@@ -134,9 +137,16 @@ bool game::loop()
} else {
modules::gameover::init(); current_module = M_GAMEOVER;
}
} else if (option==GAME_EDITOR_MAP) {
modules::editor_map::init(); current_module = M_EDITOR_MAP;
}
}
break;
case M_EDITOR_MAP:
if (!modules::editor_map::loop()) {
current_module = M_GAME;
}
break;
case M_INGAME:
option = modules::ingame::loop();
if (option != INGAME_NONE) {