Move Umbra to a submodule.

Author: HexDecimal

.gitignore

@@ -3,3 +3,6 @@ build/
 
 # Save data
 data/sav
+
+# Log file
+log.txt

.gitmodules

@@ -2,3 +2,7 @@
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
 	shallow = true
+[submodule "umbra"]
+	path = umbra
+	url = https://github.com/libtcod/umbra.git
+	shallow = true

.vscode/settings.json

@@ -83,6 +83,8 @@
     "xlocmes": "cpp",
     "xlocmon": "cpp",
     "xloctime": "cpp",
-    "xtree": "cpp"
+    "xtree": "cpp",
+    "*.rh": "cpp",
+    "set": "cpp"
   }
 }

CMakeLists.txt

@@ -36,6 +36,8 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE _USE_MATH_DEFINES)  # For M_P
 target_compile_definitions(${PROJECT_NAME} PRIVATE NO_SOUND)
 target_compile_definitions(${PROJECT_NAME} PRIVATE NO_LUA)
 
+add_subdirectory(umbra)
+
 find_package(SDL2 CONFIG REQUIRED)
 find_package(libtcod CONFIG REQUIRED)
 target_link_libraries(
@@ -44,4 +46,5 @@ target_link_libraries(
         SDL2::SDL2
         SDL2::SDL2main
         libtcod::libtcod
+        umbra::umbra
 )

data/cfg/umbra.txt

@@ -1,13 +1,32 @@
 /*
  * UMBRA CONFIGURATION FILE
+ *
+ * rootWidth (integer): width of the root console in cells
+ * rootHeight (integer): height of the root console in cells
+ * fontID (integer): the ID of the font that is to be used
+ * fullScreen (boolean): whether the application should run in full screen.
+ *                       * true = run in full screen mode
+ *                       * false = run in windowed mode (default)
+ * logLevel (string): which messages are supposed to be logged.
+ *                    * "info" = all messages down to the info level
+ *                                 (full debug mode)
+ *                    * "notice" = all debug messages down to notices
+ *                    * "warning" = all debug messages down to warnings
+ *                    * "error" = log only errors and fatal errors
+ *                                  (standard debug mode, default)
+ *                    * "fatal error" = log only fatal errors
+ *                    * "none" = don't create a logfile at all
+ *                                 (debug mode off)
+ * fontDir (string): the directory containing font files
+ * moduleChain (string): the module chain to load (optional)
  */
 
 config {
   rootWidth = 80
   rootHeight = 50
   fontID = 2
   fullScreen = false
-  debug = false
+  logLevel = "info"
   fontDir = "data/img"
   moduleChain = "pyromancer!"
 }

src/main.hpp

@@ -23,7 +23,7 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "umbra/umbra.hpp"
+#include <umbra/umbra.hpp>
 #ifndef NO_SOUND
 #include "fmod/fmod.h"
 #include "fmod/fmod_errors.h"

src/screen_mainmenu.cpp

@@ -27,6 +27,8 @@
 #include <stdio.h>
 #include "main.hpp"
 
+#include <cassert>
+
 MainMenu *MainMenu::instance=NULL;
 static const TCODColor PAPER_COLOR(46,28,18);
 //static const TCODColor TEXT_COLOR(205,165,96);
@@ -93,6 +95,7 @@ void MainMenu::onInitialise() {
 	Screen::onInitialise();
 	img=new TCODImage(CON_W*2,CON_H*2);
 	title=new TCODImage("data/img/title.png");
+	assert(title);
 	title->getSize(&titlew,&titleh);
 	titlex = CON_W-titlew/2;
 	titley = CON_H/3+28;