Permalink
Browse files

Simply renamed the DEBUG_MENU compile option into DEBUG_FEATURES

  • Loading branch information...
1 parent 868138c commit ecff83d27a477552c379c0805c39c145a7534b18 Yohann Ferreira committed Feb 13, 2013
Showing with 12 additions and 11 deletions.
  1. +2 −2 CMakeLists.txt
  2. +1 −1 ValyriaTear.cbp
  3. +2 −2 src/CMakeLists.txt
  4. +2 −1 src/engine/input.cpp
  5. +4 −4 src/modes/boot/boot.cpp
  6. +1 −1 src/modes/boot/boot.h
View
@@ -3,8 +3,8 @@ CMAKE_POLICY(VERSION 2.6)
PROJECT(VALYRIATEAR)
-OPTION(EDITOR_SUPPORT "Compile the Qt editor" OFF)
-OPTION(DEBUG_MENU "Add the debug menu options at game start" OFF)
+OPTION(EDITOR_SUPPORT "Compile the Qt editor along with the game" OFF)
+OPTION(DEBUG_FEATURES "Compile the game with the debug features" OFF)
OPTION(USE_SYSTEM_LUABIND "Use the luabind headers and lib provided by the system (Linux only)" OFF)
IF (NOT VERSION)
View
@@ -22,7 +22,7 @@
<Add option="-DWIN32" />
<Add option="-D_DEBUG" />
<Add option="-D_WINDOWS" />
- <Add option="-DDEBUG_MENU" />
+ <Add option="-DDEBUG_FEATURES" />
<Add directory="valyriatear-win32-depends/include" />
<Add directory="valyriatear-win32-depends/include/AL" />
<Add directory="valyriatear-win32-depends/include/boost" />
View
@@ -37,8 +37,8 @@ SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"")
SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"")
SET(FLAGS "${FLAGS} -DPKG_NAME=\\\"${PKG_NAME}/\\\"")
-IF (DEBUG_MENU)
- SET(FLAGS "${FLAGS} -DDEBUG_MENU")
+IF (DEBUG_FEATURES)
+ SET(FLAGS "${FLAGS} -DDEBUG_FEATURES")
ENDIF()
IF (CMAKE_BUILD_TYPE)
View
@@ -305,14 +305,15 @@ void InputEngine::_KeyEventHandler(SDL_KeyboardEvent &key_event)
VideoManager->MakeScreenshot(path);
return;
}
-#ifdef DEBUG_MENU
+#ifdef DEBUG_FEATURES
// Insert developers options here.
else if(key_event.keysym.sym == SDLK_r) {
VideoManager->ToggleFPS();
return;
} else if(key_event.keysym.sym == SDLK_a) {
// Toggle the display of debug visual engine information
VideoManager->ToggleDebugInfo();
+ return;
} else if(key_event.keysym.sym == SDLK_t) {
// Display and cycle through the texture sheets
VideoManager->Textures()->DEBUG_NextTexSheet();
View
@@ -27,7 +27,7 @@
#include "modes/mode_help_window.h"
-#ifdef DEBUG_MENU
+#ifdef DEBUG_FEATURES
// Files below are used for boot mode to do a test launch of other modes
#include "modes/battle/battle.h"
#include "modes/menu/menu.h"
@@ -462,7 +462,7 @@ void BootMode::_SetupMainMenu()
_main_menu.AddOption(UTranslate("Options"), &BootMode::_OnOptions);
// Insert the debug options
-#ifdef DEBUG_MENU
+#ifdef DEBUG_FEATURES
_main_menu.SetDimensions(1000.0f, 50.0f, 7, 1, 7, 1);
_main_menu.AddOption(UTranslate("Battle"), &BootMode::_DEBUG_OnBattle);
_main_menu.AddOption(UTranslate("Menu"), &BootMode::_DEBUG_OnMenu);
@@ -778,7 +778,7 @@ void BootMode::_OnQuit()
}
-#ifdef DEBUG_MENU
+#ifdef DEBUG_FEATURES
void BootMode::_DEBUG_OnBattle()
{
ReadScriptDescriptor read_data;
@@ -803,7 +803,7 @@ void BootMode::_DEBUG_OnShop()
read_data.RunScriptFunction("dat/debug/debug_shop.lua",
"BootShopTest", true);
}
-#endif // #ifdef DEBUG_MENU
+#endif // #ifdef DEBUG_FEATURES
void BootMode::_OnVideoOptions()
View
@@ -231,7 +231,7 @@ class BootMode : public hoa_mode_manager::GameMode
void _OnOptions();
void _OnQuit();
-#ifdef DEBUG_MENU
+#ifdef DEBUG_FEATURES
void _DEBUG_OnBattle();
void _DEBUG_OnMenu();
void _DEBUG_OnShop();

0 comments on commit ecff83d

Please sign in to comment.