From 45ba35ca4bd93d94c3a305a69a31c92ccf3b9ae0 Mon Sep 17 00:00:00 2001 From: fgenesis Date: Sat, 20 Jul 2013 02:27:53 +0200 Subject: [PATCH] Get rid of AQUARIA_FULL define and move the setting to usersettings.xml. Some changes regarding AQUARIA_DEMO. This means there are no longer two builds necessary (one normal, one dev), and all mod deveopment can be done using one build, by setting Demo builds now allow browsing the online mod list, but neither downloading nor starting mods or applying patches. --- Aquaria/AquariaCompileConfig.h | 1 - Aquaria/AquariaWin32Dev.ico | Bin 26014 -> 0 bytes .../{AquariaWin32.ico => AquariaWin32OSE.ico} | Bin Aquaria/DSQ.cpp | 57 +++++++----------- Aquaria/DSQ.h | 1 - Aquaria/Main.cpp | 17 +++--- Aquaria/ModSelector.cpp | 23 +++---- Aquaria/ScriptInterface.cpp | 24 +++----- Aquaria/UserSettings.cpp | 12 ++++ Aquaria/UserSettings.h | 3 +- Aquaria/WorldMapRender.cpp | 6 +- Aquaria/aquaria.rc | 9 +-- CMakeLists.txt | 7 --- 13 files changed, 72 insertions(+), 88 deletions(-) delete mode 100644 Aquaria/AquariaWin32Dev.ico rename Aquaria/{AquariaWin32.ico => AquariaWin32OSE.ico} (100%) diff --git a/Aquaria/AquariaCompileConfig.h b/Aquaria/AquariaCompileConfig.h index a7b9cd6..922d212 100644 --- a/Aquaria/AquariaCompileConfig.h +++ b/Aquaria/AquariaCompileConfig.h @@ -5,7 +5,6 @@ // Define BBGE_SKIP_CONFIG_HEADERS to use CMake-only configuration. #ifndef BBGE_SKIP_CONFIG_HEADERS - #define AQUARIA_FULL 1 //#define AQUARIA_DEMO 1 #define AQUARIA_BUILD_CONSOLE 1 #define AQUARIA_BUILD_SCENEEDITOR 1 diff --git a/Aquaria/AquariaWin32Dev.ico b/Aquaria/AquariaWin32Dev.ico deleted file mode 100644 index 3909c5831a06c7811bec3ea39922e837add3184a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26014 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"defense", 0.5); sound->playSfx("visionwakeup"); */ -#if defined(AQUARIA_FULL) || defined(AQUARIA_DEMO) - float trans = 0.5; - overlay->alpha.interpolateTo(1, trans); - core->main(trans); -#endif + + // Don't do transitions for a faster start up in dev mode + if (!isDeveloperKeys()) + { + float trans = 0.5; + overlay->alpha.interpolateTo(1, trans); + core->main(trans); + } + removeRenderObject(loading); loading = 0; removeRenderObject(sidel); @@ -1581,11 +1577,11 @@ This build is not yet final, and as such there are a couple things lacking. They bindInput(); -#if defined(AQUARIA_FULL) || defined(AQUARIA_DEMO) - enqueueJumpState("BitBlotLogo"); -#else - title(); -#endif + // Go directly to the title in dev mode + if(isDeveloperKeys()) + title(); + else + enqueueJumpState("BitBlotLogo"); } void DSQ::recreateBlackBars() @@ -2006,7 +2002,7 @@ void DSQ::reloadDevice() #ifdef AQUARIA_BUILD_CONSOLE void DSQ::toggleConsole() { - if (console) + if (console && isDeveloperKeys()) { if (console->alpha == 0) { @@ -2793,11 +2789,6 @@ void DSQ::nag(NagType type) void DSQ::doModSelect() { -#ifdef AQUARIA_DEMO - nag(NAG_TOTITLE); - return; -#endif - modIsSelected = false; dsq->loadMods(); @@ -2811,10 +2802,14 @@ void DSQ::doModSelect() main(-1); clearModSelector(); - + if (modIsSelected) { +#ifdef AQUARIA_DEMO + nag(NAG_TOTITLE); +#else dsq->startSelectedMod(); +#endif } inModSelector = false; @@ -4147,21 +4142,11 @@ void DSQ::vision(std::string folder, int num, bool ignoreMusic) bool DSQ::isDeveloperKeys() { - ///HACK TEMPORARY - //return true; - -#if !defined(AQUARIA_FULL) && !defined(AQUARIA_DEMO) - return true; -#endif - #ifdef AQUARIA_DEMO return false; #endif -#ifdef AQUARIA_FULL - return false; -#endif - return developerKeys; + return user.system.devModeOn; } bool DSQ::canOpenEditor() const diff --git a/Aquaria/DSQ.h b/Aquaria/DSQ.h index 6e013ba..523ff86 100644 --- a/Aquaria/DSQ.h +++ b/Aquaria/DSQ.h @@ -1612,7 +1612,6 @@ protected: void updatepecue(float dt); std::vector pecue; - bool developerKeys; void onMouseInput(); std::vector voxQueue; diff --git a/Aquaria/Main.cpp b/Aquaria/Main.cpp index 290e54d..ed237b8 100644 --- a/Aquaria/Main.cpp +++ b/Aquaria/Main.cpp @@ -31,26 +31,27 @@ static void MakeRan(void) { #ifdef BBGE_BUILD_WINDOWS std::ofstream out("ran"); - for (int i = 0; i < 32; i++) - out << rand()%1000; - out.close(); + if(out) + { + for (int i = 0; i < 32; i++) + out << rand()%1000; + out.close(); + } #endif } static void StartAQConfig() { #if defined(BBGE_BUILD_WINDOWS) -#if defined(AQUARIA_DEMO) || defined(AQUARIA_FULL) - if (!exists("ran", false)) + if (!exists("ran", false, true)) { MakeRan(); - if(exists("aqconfig.exe", false)) + if(exists("AQConfig.exe", false, true)) { - ShellExecute(NULL, "open", "aqconfig.exe", NULL, NULL, SW_SHOWNORMAL); + ShellExecute(NULL, "open", "AQConfig.exe", NULL, NULL, SW_SHOWNORMAL); exit(0); } } -#endif remove("ran"); #endif } diff --git a/Aquaria/ModSelector.cpp b/Aquaria/ModSelector.cpp index dd03b87..5150475 100644 --- a/Aquaria/ModSelector.cpp +++ b/Aquaria/ModSelector.cpp @@ -338,14 +338,12 @@ void ModSelectorScreen::initNetPanel() #ifdef BBGE_BUILD_VFS if(!gotServerList) { - // FIXME: demo should be able to see downloadable mods imho -#ifndef AQUARIA_DEMO moddl.init(); std::string serv = dsq->user.network.masterServer; if(serv.empty()) serv = DEFAULT_MASTER_SERVER; moddl.GetModlist(serv, true, true); -#endif + gotServerList = true; // try this only once (is automatically reset on failure) } #endif @@ -502,11 +500,6 @@ void ModIcon::onClick() { dsq->sound->playSfx("click"); -#ifdef AQUARIA_DEMO - dsq->nag(NAG_TOTITLE); - return; -#endif - switch(modType) { case MODTYPE_MOD: @@ -520,18 +513,24 @@ void ModIcon::onClick() case MODTYPE_PATCH: { + #ifdef AQUARIA_DEMO + dsq->sound->playSfx("denied"); + core->quitNestedMain(); + dsq->modIsSelected = true; // HACK: trigger nag screen + dsq->selectedMod = -1; + break; + #endif + std::set::iterator it = dsq->activePatches.find(fname); if(it != dsq->activePatches.end()) { dsq->sound->playSfx("pet-off"); dsq->unapplyPatch(fname); - //dsq->screenMessage(modname + " - deactivated"); // DEBUG } else { dsq->sound->playSfx("pet-on"); dsq->applyPatch(fname); - //dsq->screenMessage(modname + " - activated"); // DEBUG } updateStatus(); break; @@ -711,7 +710,9 @@ void ModIconOnline::onClick() dsq->sound->playSfx("click"); #ifdef AQUARIA_DEMO - dsq->nag(NAG_TOTITLE); + core->quitNestedMain(); + dsq->modIsSelected = true; // HACK: trigger nag screen + dsq->selectedMod = -1; return; #endif diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp index 57ed630..aea95ea 100644 --- a/Aquaria/ScriptInterface.cpp +++ b/Aquaria/ScriptInterface.cpp @@ -39,8 +39,6 @@ extern "C" #include "../BBGE/MathFunctions.h" -#if defined(AQUARIA_FULL) || defined(AQUARIA_DEMO) - // Define this to 1 to check types of pointers passed to functions, // and warn if a type mismatch is detected. In this case, // the pointer is treated as NULL, to avoid crashing or undefined behavior. @@ -51,25 +49,16 @@ extern "C" // If true, send all sort of script errors to errorLog instead of debugLog. // On win32/OSX, this pops up message boxes which help to locate errors easily, // but can be annoying for regular gameplay. -const bool loudScriptErrors = false; +bool loudScriptErrors = false; // Set this to true to complain whenever a script tries to // get or set a global variable. -const bool complainOnGlobalVar = false; +bool complainOnGlobalVar = false; // Set this to true to complain whenever a script tries to get an undefined // thread-local variable. -const bool complainOnUndefLocal = false; +bool complainOnUndefLocal = false; -#else - -// Use maximal safety for developer builds. -#define CHECK_POINTER_TYPES 1 -const bool loudScriptErrors = true; -const bool complainOnGlobalVar = true; -const bool complainOnUndefLocal = true; - -#endif // List of all interface functions called by C++ code, terminated by NULL. static const char * const interfaceFunctions[] = { @@ -9739,6 +9728,13 @@ ScriptInterface::ScriptInterface() void ScriptInterface::init() { + bool devmode = dsq->isDeveloperKeys(); + + // Everything on in dev mode, everything off otherwise. + bool loudScriptErrors = devmode; + bool complainOnGlobalVar = devmode; + bool complainOnUndefLocal = devmode; + if (!baseState) baseState = createLuaVM(); } diff --git a/Aquaria/UserSettings.cpp b/Aquaria/UserSettings.cpp index 32d47e9..e9ab64d 100644 --- a/Aquaria/UserSettings.cpp +++ b/Aquaria/UserSettings.cpp @@ -54,6 +54,12 @@ void UserSettings::save() xml_locale.SetAttribute("name", system.locale); } xml_system.InsertEndChild(xml_locale); + + TiXmlElement xml_devmode("DeveloperMode"); + { + xml_devmode.SetAttribute("on", system.devModeOn); + } + xml_system.InsertEndChild(xml_devmode); } doc.InsertEndChild(xml_system); @@ -370,6 +376,12 @@ void UserSettings::load(bool doApply, const std::string &overrideFile) { system.locale = xml_locale->Attribute("name"); } + + TiXmlElement *xml_devmode = xml_system->FirstChildElement("DeveloperMode"); + if (xml_devmode) + { + xml_devmode->Attribute("on", &system.devModeOn); + } } TiXmlElement *xml_audio = doc.FirstChildElement("Audio"); diff --git a/Aquaria/UserSettings.h b/Aquaria/UserSettings.h index 1c4607e..c6b0c22 100644 --- a/Aquaria/UserSettings.h +++ b/Aquaria/UserSettings.h @@ -78,9 +78,10 @@ class UserSettings public: struct System { - System() { debugLogOn = 0; } + System() { debugLogOn = 0; devModeOn = 0; } int debugLogOn; std::string locale; + int devModeOn; } system; struct Audio diff --git a/Aquaria/WorldMapRender.cpp b/Aquaria/WorldMapRender.cpp index b695cb0..55d9fe0 100644 --- a/Aquaria/WorldMapRender.cpp +++ b/Aquaria/WorldMapRender.cpp @@ -1220,7 +1220,11 @@ void WorldMapRender::onUpdate(float dt) else { #ifdef AQUARIA_BUILD_MAPVIS - if (!dsq->isInCutscene() && dsq->game->avatar && activeTile && !dsq->game->sceneEditor.isOn()) + if (!dsq->isInCutscene() && dsq->game->avatar && activeTile + #ifdef AQUARIA_BUILD_SCENEEDITOR + && !dsq->game->sceneEditor.isOn() + #endif + ) { const float screenWidth = core->getVirtualWidth() * core->invGlobalScale; const float screenHeight = core->getVirtualHeight() * core->invGlobalScale; diff --git a/Aquaria/aquaria.rc b/Aquaria/aquaria.rc index 87d609f..2084b20 100644 --- a/Aquaria/aquaria.rc +++ b/Aquaria/aquaria.rc @@ -63,12 +63,5 @@ END END // Icon -#if defined(AQUARIA_FULL) || defined(AQUARIA_DEMO) -101 ICON "AquariaWin32.ico" -#else -101 ICON "AquariaWin32Dev.ico" -#endif - -//101 ICON "Aquaria.ico" - +101 ICON "AquariaWin32OSE.ico" diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b3823b..f236bd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build (Debug, RelWithDebInfo, Release)" FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) -OPTION(AQUARIA_DEVELOPER_BUILD "Developer Build?" FALSE) OPTION(AQUARIA_DEMO_BUILD "Demo Build?" FALSE) OPTION(AQUARIA_USE_VFS "Use Virtual File System? Required for some additional features." TRUE) @@ -258,12 +257,6 @@ IF(AQUARIA_USE_VFS) ADD_DEFINITIONS(-DBBGE_BUILD_VFS=1) ENDIF(AQUARIA_USE_VFS) -IF(AQUARIA_DEVELOPER_BUILD) - message(STATUS "Developer build.") -ELSE(AQUARIA_DEVELOPER_BUILD) - ADD_DEFINITIONS(-DAQUARIA_FULL=1) -ENDIF(AQUARIA_DEVELOPER_BUILD) - IF(AQUARIA_DEMO_BUILD) message(STATUS "Demo build.") ADD_DEFINITIONS(-DAQUARIA_DEMO=1)