Skip to content

Commit

Permalink
Got rid of the defs.h file.
Browse files Browse the repository at this point in the history
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
Yohann Ferreira committed Mar 22, 2013
1 parent 51feac9 commit 2641586
Show file tree
Hide file tree
Showing 64 changed files with 235 additions and 512 deletions.
5 changes: 2 additions & 3 deletions ValyriaTear.cbp
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Expand Up @@ -315,7 +315,6 @@ engine/script/script_write.h
engine/script/script_write.cpp
utils.h
utils.cpp
defs.h
)

SET(SRCS
Expand Down
2 changes: 2 additions & 0 deletions src/common/dialogue.h
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/common/global/global.h
Expand Up @@ -40,6 +40,8 @@
namespace hoa_global
{

class GameGlobal;

//! \brief The singleton pointer responsible for the management of global game data.
extern GameGlobal *GlobalManager;

Expand Down
2 changes: 2 additions & 0 deletions src/common/global/global_actors.cpp
Expand Up @@ -28,6 +28,8 @@ using namespace hoa_script;
namespace hoa_global
{

extern bool GLOBAL_DEBUG;

////////////////////////////////////////////////////////////////////////////////
// GlobalAttackPoint class
////////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 6 additions & 0 deletions src/common/global/global_objects.h
Expand Up @@ -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
***
Expand Down
4 changes: 4 additions & 0 deletions src/common/global/global_skills.cpp
Expand Up @@ -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
{

Expand Down
1 change: 0 additions & 1 deletion src/common/gui/menu_window.h
Expand Up @@ -17,7 +17,6 @@
#ifndef __MENU_WINDOW_HEADER__
#define __MENU_WINDOW_HEADER__

#include "defs.h"
#include "utils.h"

#include "gui.h"
Expand Down
1 change: 0 additions & 1 deletion src/common/gui/option.cpp
Expand Up @@ -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
Expand Down

0 comments on commit 2641586

Please sign in to comment.