- [FIX] No es podia entrar al editor de bitmap_pos des de l'editor

- [FIX] Recreativa afegida
- [NEW] Prologo acabat
- [FIX] Quan s'acava el boost de invulnerabilitat se moria
This commit is contained in:
2024-10-10 09:33:56 +02:00
parent cabbb52cbb
commit ec7ac7114e
18 changed files with 187 additions and 7 deletions

View File

@@ -29,6 +29,7 @@
#include "m_editor_bitmap.h"
#include "m_end_sequence.h"
#include "m_prologo_intro.h"
#include "m_end_prologo_sequence.h"
#define M_LOGO 0
#define M_INTRO 1
@@ -47,6 +48,7 @@
#define M_EDITOR_BITMAP 14
#define M_END 15
#define M_PROLOGO_INTRO 16
#define M_PROLOGO_END 17
int current_module = M_LOGO;
@@ -157,6 +159,9 @@ bool game::loop()
case M_END:
if (!modules::end_sequence::loop()) { modules::menu::init(); current_module = M_MENU; }
break;
case M_PROLOGO_END:
if (!modules::end_prologo_sequence::loop()) { modules::end_sequence::init(true); current_module = M_END; }
break;
case M_MENU:
option = modules::menu::loop();
if (option != OPTION_NONE) {
@@ -195,7 +200,11 @@ bool game::loop()
modules::editor_bitmap::init(EDITING_BITMAP_POS); current_module = M_EDITOR_BITMAP;
} else if (option==GAME_EDITOR_BITMAP_SIZE) {
modules::editor_bitmap::init(EDITING_BITMAP_SIZE); current_module = M_EDITOR_BITMAP;
} else if (option==GAME_END) { modules::end_sequence::init(); current_module = M_END; }
} else if (option==GAME_END) {
modules::end_sequence::init(); current_module = M_END;
} else if (option==GAME_PROLOGO_END) {
modules::end_prologo_sequence::init(); current_module = M_PROLOGO_END;
}
}
break;