- Nous gràfics

- [FIX] text en el combobox
- [NEW] Selector de bitmap
- [NEW] Selector de color
- [NEW] Shortcuts per a esborrar (SUPR) i duplicar (CTRL+D) actors

source/main.cpp

@@ -21,6 +21,8 @@
 #include "m_menu_audio.h"
 #include "m_editor_map.h"
 #include "m_editor_templates.h"
+#include "m_editor_colors.h"
+#include "m_editor_bitmap_file.h"
 
 #define M_LOGO 0
 #define M_MENU 1
@@ -32,6 +34,8 @@
 #define M_MENU_AUDIO 7
 #define M_EDITOR_MAP 8
 #define M_EDITOR_TEMPLATES 9
+#define M_EDITOR_COLORS 10
+#define M_EDITOR_BITMAP_FILE 11
 
 int current_module = M_LOGO;
 int zoom = 3;
@@ -142,6 +146,10 @@ bool game::loop()
                     modules::editor_map::init(); current_module = M_EDITOR_MAP;
                 } else if (option==GAME_EDITOR_TEMPLATES) {
                     modules::editor_templates::init(); current_module = M_EDITOR_TEMPLATES;
+                } else if (option==GAME_EDITOR_COLORS) {
+                    modules::editor_colors::init(); current_module = M_EDITOR_COLORS;
+                } else if (option==GAME_EDITOR_BITMAP_FILE) {
+                    modules::editor_bitmap_file::init(); current_module = M_EDITOR_BITMAP_FILE;
                 }
             }
             break;
@@ -155,6 +163,16 @@ bool game::loop()
                 current_module = M_GAME;
             }
             break;
+        case M_EDITOR_COLORS:
+            if (!modules::editor_colors::loop()) {
+                current_module = M_GAME;
+            }
+            break;
+        case M_EDITOR_BITMAP_FILE:
+            if (!modules::editor_bitmap_file::loop()) {
+                current_module = M_GAME;
+            }
+            break;
         case M_INGAME:
             option = modules::ingame::loop();
             if (option != INGAME_NONE) {