From e626db8ce55ca932c86e16a9acdf47df1840c22c Mon Sep 17 00:00:00 2001 From: nukeykt Date: Thu, 21 Nov 2019 21:51:27 +0900 Subject: [PATCH] Parse exhumed.def if available --- source/exhumed/src/exhumed.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp index 5503bb884..f0ef6edc6 100644 --- a/source/exhumed/src/exhumed.cpp +++ b/source/exhumed/src/exhumed.cpp @@ -475,7 +475,7 @@ const char *g_gameNamePtr = NULL; // grp handling static const char *defaultgamegrp = "STUFF.DAT"; -static const char *defaultdeffilename = "powerslave.def"; +static const char *defaultdeffilename = "exhumed.def"; // g_grpNamePtr can ONLY point to a malloc'd block (length BMAX_PATH) char *g_grpNamePtr = NULL; @@ -2581,6 +2581,16 @@ int app_main(int argc, char const* const* argv) // temp - moving InstallEngine(); before FadeOut as we use nextpage() in FadeOut InstallEngine(); + const char *defsfile = G_DefFile(); + uint32_t stime = timerGetTicks(); + if (!loaddefinitionsfile(defsfile)) + { + uint32_t etime = timerGetTicks(); + initprintf("Definitions file \"%s\" loaded in %d ms.\n", defsfile, etime-stime); + } + loaddefinitions_game(defsfile, FALSE); + + if (enginePostInit()) ShutDown();