Permalink
Browse files

Got rid of the defs.h file.

Now the class and struct declarations should belong in their respective files.

It made me earn 40 sec per full compilation process when using C::B 12.10
and its mingw-gcc and reduced the unstripped debug binary by something half a megabyte.

So I'm definitely going toward this removal.
  • Loading branch information...
1 parent 51feac9 commit 26415860bfd393fa039783e0ef06255c27c73f6f Yohann Ferreira committed Mar 22, 2013
Showing with 235 additions and 512 deletions.
  1. +2 −3 ValyriaTear.cbp
  2. +0 −1 src/CMakeLists.txt
  3. +2 −0 src/common/dialogue.h
  4. +2 −0 src/common/global/global.h
  5. +2 −0 src/common/global/global_actors.cpp
  6. +6 −0 src/common/global/global_objects.h
  7. +4 −0 src/common/global/global_skills.cpp
  8. +0 −1 src/common/gui/menu_window.h
  9. +0 −1 src/common/gui/option.cpp
  10. +0 −426 src/defs.h
  11. +0 −1 src/editor/tileset.h
  12. +2 −0 src/engine/audio/audio.h
  13. +8 −0 src/engine/audio/audio_descriptor.h
  14. +2 −0 src/engine/audio/audio_effects.h
  15. +2 −0 src/engine/audio/audio_input.cpp
  16. +0 −1 src/engine/audio/audio_input.h
  17. +2 −0 src/engine/audio/audio_stream.cpp
  18. +0 −1 src/engine/audio/audio_stream.h
  19. +0 −1 src/engine/mode_manager.cpp
  20. +9 −8 src/engine/script/script.h
  21. +2 −3 src/engine/script/script_read.h
  22. +2 −3 src/engine/script/script_write.h
  23. +4 −0 src/engine/script_supervisor.h
  24. +8 −3 src/engine/system.h
  25. +4 −5 src/engine/video/interpolator.cpp
  26. +0 −1 src/engine/video/interpolator.h
  27. +5 −2 src/engine/video/particle_effect.h
  28. +0 −1 src/engine/video/particle_emitter.h
  29. +2 −1 src/engine/video/particle_manager.h
  30. +15 −0 src/main.cpp
  31. +23 −2 src/main_options.cpp
  32. +2 −0 src/main_options.h
  33. +6 −0 src/modes/battle/battle.h
  34. +0 −1 src/modes/battle/battle_actions.cpp
  35. +0 −1 src/modes/battle/battle_actions.h
  36. +4 −1 src/modes/battle/battle_actors.h
  37. +0 −2 src/modes/battle/battle_dialogue.h
  38. +0 −1 src/modes/battle/battle_effects.h
  39. +0 −3 src/modes/battle/battle_indicators.h
  40. +2 −3 src/modes/battle/battle_sequence.h
  41. +4 −6 src/modes/battle/battle_utils.cpp
  42. +3 −0 src/modes/battle/battle_utils.h
  43. +2 −0 src/modes/boot/boot_menu.h
  44. +4 −1 src/modes/map/map_dialogue.cpp
  45. +2 −0 src/modes/map/map_dialogue.h
  46. +5 −0 src/modes/map/map_events.h
  47. +14 −0 src/modes/map/map_mode.h
  48. +20 −0 src/modes/map/map_objects.h
  49. +2 −0 src/modes/map/map_sprites.h
  50. +5 −0 src/modes/map/map_tiles.h
  51. +4 −0 src/modes/map/map_treasure.h
  52. +2 −0 src/modes/map/map_zones.h
  53. +5 −5 src/modes/menu/menu.h
  54. +2 −0 src/modes/menu/menu_views.h
  55. +4 −0 src/modes/save/save_mode.h
  56. +0 −1 src/modes/scene.cpp
  57. +2 −3 src/modes/scene.h
  58. +7 −7 src/modes/shop/shop.cpp
  59. +9 −0 src/modes/shop/shop.h
  60. +4 −4 src/modes/shop/shop_buy.cpp
  61. +3 −0 src/modes/shop/shop_buy.h
  62. +4 −4 src/modes/shop/shop_sell.cpp
  63. +2 −0 src/modes/shop/shop_sell.h
  64. +4 −4 src/modes/shop/shop_trade.cpp
View
@@ -263,7 +263,6 @@
<Unit filename="src/common/gui/option.h" />
<Unit filename="src/common/gui/textbox.cpp" />
<Unit filename="src/common/gui/textbox.h" />
- <Unit filename="src/defs.h" />
<Unit filename="src/engine/audio/audio.cpp" />
<Unit filename="src/engine/audio/audio.h" />
<Unit filename="src/engine/audio/audio_descriptor.cpp" />
@@ -445,14 +444,14 @@
<Unit filename="src/modes/boot/boot.h" />
<Unit filename="src/modes/boot/boot_menu.cpp" />
<Unit filename="src/modes/boot/boot_menu.h" />
- <Unit filename="src/modes/map/map_mode.cpp" />
- <Unit filename="src/modes/map/map_mode.h" />
<Unit filename="src/modes/map/map_dialogue.cpp" />
<Unit filename="src/modes/map/map_dialogue.h" />
<Unit filename="src/modes/map/map_events.cpp" />
<Unit filename="src/modes/map/map_events.h" />
<Unit filename="src/modes/map/map_minimap.cpp" />
<Unit filename="src/modes/map/map_minimap.h" />
+ <Unit filename="src/modes/map/map_mode.cpp" />
+ <Unit filename="src/modes/map/map_mode.h" />
<Unit filename="src/modes/map/map_objects.cpp" />
<Unit filename="src/modes/map/map_objects.h" />
<Unit filename="src/modes/map/map_sprites.cpp" />
View
@@ -315,7 +315,6 @@ engine/script/script_write.h
engine/script/script_write.cpp
utils.h
utils.cpp
-defs.h
)
SET(SRCS
View
@@ -25,6 +25,8 @@
namespace hoa_common
{
+class CommonDialogueOptions;
+
//! \name Constants used among common dialogue classes
//@{
//! \brief Indicates that the next line to read should follow sequentially
@@ -40,6 +40,8 @@
namespace hoa_global
{
+class GameGlobal;
+
//! \brief The singleton pointer responsible for the management of global game data.
extern GameGlobal *GlobalManager;
@@ -28,6 +28,8 @@ using namespace hoa_script;
namespace hoa_global
{
+extern bool GLOBAL_DEBUG;
+
////////////////////////////////////////////////////////////////////////////////
// GlobalAttackPoint class
////////////////////////////////////////////////////////////////////////////////
@@ -25,9 +25,15 @@
#include "engine/video/image.h"
#include "engine/script/script.h"
+namespace hoa_script {
+class ReadScriptDescriptor;
+}
+
namespace hoa_global
{
+class GlobalShard;
+
/** ****************************************************************************
*** \brief An abstract base class for representing a game object
***
@@ -25,6 +25,10 @@ using namespace hoa_video;
using namespace hoa_script;
using namespace hoa_battle;
+namespace hoa_battle {
+extern bool BATTLE_DEBUG;
+}
+
namespace hoa_global
{
@@ -17,7 +17,6 @@
#ifndef __MENU_WINDOW_HEADER__
#define __MENU_WINDOW_HEADER__
-#include "defs.h"
#include "utils.h"
#include "gui.h"
@@ -16,7 +16,6 @@
using namespace hoa_utils;
using namespace hoa_video;
using namespace hoa_video::private_video;
-using namespace hoa_input;
using namespace hoa_gui::private_gui;
namespace hoa_gui
Oops, something went wrong.

0 comments on commit 2641586

Please sign in to comment.