diff options
author | Einar Johan Trøan Sømåen | 2012-07-21 18:19:07 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-21 19:15:33 +0200 |
commit | 5683f076331d2831eb4720b65bb53e8d01ca33ee (patch) | |
tree | 4357d989476643db887d5f5a95f6fd165afd0514 /engines/wintermute/base | |
parent | 0622b2c5b8260c0f0c01122d6fbc5e10013d1613 (diff) | |
download | scummvm-rg350-5683f076331d2831eb4720b65bb53e8d01ca33ee.tar.gz scummvm-rg350-5683f076331d2831eb4720b65bb53e8d01ca33ee.tar.bz2 scummvm-rg350-5683f076331d2831eb4720b65bb53e8d01ca33ee.zip |
WINTERMUTE: Rename CamelCased filenames to prefixed_under_score-filenames
This is mostly a lead-up to namespacing the Ad/Base folders, and then
possibly removing the prefixes from the files, it also has the added
benefit of getting rid of the odd case-typos that makes for issues
on platforms that don't ignore case.
Diffstat (limited to 'engines/wintermute/base')
-rw-r--r-- | engines/wintermute/base/base.cpp (renamed from engines/wintermute/base/BBase.cpp) | 8 | ||||
-rw-r--r-- | engines/wintermute/base/base.h (renamed from engines/wintermute/base/BBase.h) | 0 | ||||
-rw-r--r-- | engines/wintermute/base/base_active_rect.cpp (renamed from engines/wintermute/base/BActiveRect.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/base_active_rect.h (renamed from engines/wintermute/base/BActiveRect.h) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_debugger.cpp (renamed from engines/wintermute/base/BDebugger.cpp) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_debugger.h (renamed from engines/wintermute/base/BDebugger.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_dynamic_buffer.cpp (renamed from engines/wintermute/base/BDynBuffer.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_dynamic_buffer.h (renamed from engines/wintermute/base/BDynBuffer.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_fader.cpp (renamed from engines/wintermute/base/BFader.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_fader.h (renamed from engines/wintermute/base/BFader.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_file_manager.cpp (renamed from engines/wintermute/base/BFileManager.cpp) | 20 | ||||
-rw-r--r-- | engines/wintermute/base/base_file_manager.h (renamed from engines/wintermute/base/BFileManager.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_frame.cpp (renamed from engines/wintermute/base/BFrame.cpp) | 20 | ||||
-rw-r--r-- | engines/wintermute/base/base_frame.h (renamed from engines/wintermute/base/BFrame.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_game.cpp (renamed from engines/wintermute/base/BGame.cpp) | 59 | ||||
-rw-r--r-- | engines/wintermute/base/base_game.h (renamed from engines/wintermute/base/BGame.h) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/base_keyboard_state.cpp (renamed from engines/wintermute/base/BKeyboardState.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/base_keyboard_state.h (renamed from engines/wintermute/base/BKeyboardState.h) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_named_object.cpp (renamed from engines/wintermute/base/BNamedObject.cpp) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_named_object.h (renamed from engines/wintermute/base/BNamedObject.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_object.cpp (renamed from engines/wintermute/base/BObject.cpp) | 18 | ||||
-rw-r--r-- | engines/wintermute/base/base_object.h (renamed from engines/wintermute/base/BObject.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_parser.cpp (renamed from engines/wintermute/base/BParser.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_parser.h (renamed from engines/wintermute/base/BParser.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_persistence_manager.cpp (renamed from engines/wintermute/base/BPersistMgr.cpp) | 14 | ||||
-rw-r--r-- | engines/wintermute/base/base_persistence_manager.h (renamed from engines/wintermute/base/BPersistMgr.h) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_point.cpp (renamed from engines/wintermute/base/BPoint.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_point.h (renamed from engines/wintermute/base/BPoint.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_quick_msg.cpp (renamed from engines/wintermute/base/BQuickMsg.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_quick_msg.h (renamed from engines/wintermute/base/BQuickMsg.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_region.cpp (renamed from engines/wintermute/base/BRegion.cpp) | 16 | ||||
-rw-r--r-- | engines/wintermute/base/base_region.h (renamed from engines/wintermute/base/BRegion.h) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_registry.cpp (renamed from engines/wintermute/base/BRegistry.cpp) | 8 | ||||
-rw-r--r-- | engines/wintermute/base/base_registry.h (renamed from engines/wintermute/base/BRegistry.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_save_thumb_helper.cpp (renamed from engines/wintermute/base/BSaveThumbHelper.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_save_thumb_helper.h (renamed from engines/wintermute/base/BSaveThumbHelper.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_script_holder.cpp (renamed from engines/wintermute/base/BScriptHolder.cpp) | 14 | ||||
-rw-r--r-- | engines/wintermute/base/base_script_holder.h (renamed from engines/wintermute/base/BScriptHolder.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_scriptable.cpp (renamed from engines/wintermute/base/BScriptable.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/base_scriptable.h (renamed from engines/wintermute/base/BScriptable.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_sprite.cpp (renamed from engines/wintermute/base/BSprite.cpp) | 26 | ||||
-rw-r--r-- | engines/wintermute/base/base_sprite.h (renamed from engines/wintermute/base/BSprite.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_string_table.cpp (renamed from engines/wintermute/base/BStringTable.cpp) | 8 | ||||
-rw-r--r-- | engines/wintermute/base/base_string_table.h (renamed from engines/wintermute/base/BStringTable.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_sub_frame.cpp (renamed from engines/wintermute/base/BSubFrame.cpp) | 16 | ||||
-rw-r--r-- | engines/wintermute/base/base_sub_frame.h (renamed from engines/wintermute/base/BSubFrame.h) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_surface_storage.cpp (renamed from engines/wintermute/base/BSurfaceStorage.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/base_surface_storage.h (renamed from engines/wintermute/base/BSurfaceStorage.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_transition_manager.cpp (renamed from engines/wintermute/base/BTransitionMgr.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_transition_manager.h (renamed from engines/wintermute/base/BTransitionMgr.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/base_viewport.cpp (renamed from engines/wintermute/base/BViewport.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_viewport.h (renamed from engines/wintermute/base/BViewport.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/file/BPkgFile.cpp | 6 | ||||
-rw-r--r-- | engines/wintermute/base/file/BPkgFile.h | 5 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_disk_file.cpp (renamed from engines/wintermute/base/file/BDiskFile.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_disk_file.h (renamed from engines/wintermute/base/file/BDiskFile.h) | 0 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_file.cpp (renamed from engines/wintermute/base/file/BFile.cpp) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_file.h (renamed from engines/wintermute/base/file/BFile.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_file_entry.cpp (renamed from engines/wintermute/base/file/BFileEntry.cpp) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_file_entry.h (renamed from engines/wintermute/base/file/BFileEntry.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_package.cpp (renamed from engines/wintermute/base/file/BPackage.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_package.h (renamed from engines/wintermute/base/file/BPackage.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_resources.cpp (renamed from engines/wintermute/base/BResources.cpp) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_resources.h (renamed from engines/wintermute/base/BResources.h) | 0 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_save_thumb_file.cpp (renamed from engines/wintermute/base/file/BSaveThumbFile.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/file/base_save_thumb_file.h (renamed from engines/wintermute/base/file/BSaveThumbFile.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font.cpp (renamed from engines/wintermute/base/font/BFont.cpp) | 12 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font.h (renamed from engines/wintermute/base/font/BFont.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.cpp (renamed from engines/wintermute/base/font/BFontBitmap.cpp) | 18 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.h (renamed from engines/wintermute/base/font/BFontBitmap.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font_storage.cpp (renamed from engines/wintermute/base/font/BFontStorage.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font_storage.h (renamed from engines/wintermute/base/font/BFontStorage.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font_truetype.cpp (renamed from engines/wintermute/base/font/BFontTT.cpp) | 16 | ||||
-rw-r--r-- | engines/wintermute/base/font/base_font_truetype.h (renamed from engines/wintermute/base/font/BFontTT.h) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_image.cpp | 8 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_image.h | 2 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_renderer.cpp | 6 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_renderer.h | 2 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_surface.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/base_surface.h | 4 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/osystem/base_render_osystem.cpp | 12 | ||||
-rw-r--r-- | engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 8 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_emitter.cpp (renamed from engines/wintermute/base/particles/PartEmitter.cpp) | 16 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_emitter.h (renamed from engines/wintermute/base/particles/PartEmitter.h) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_force.cpp (renamed from engines/wintermute/base/particles/PartForce.cpp) | 4 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_force.h (renamed from engines/wintermute/base/particles/PartForce.h) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_particle.cpp (renamed from engines/wintermute/base/particles/PartParticle.cpp) | 8 | ||||
-rw-r--r-- | engines/wintermute/base/particles/part_particle.h (renamed from engines/wintermute/base/particles/PartParticle.h) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script.cpp (renamed from engines/wintermute/base/scriptables/ScScript.cpp) | 10 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script.h (renamed from engines/wintermute/base/scriptables/ScScript.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp (renamed from engines/wintermute/base/scriptables/ScEngine.cpp) | 20 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_engine.h (renamed from engines/wintermute/base/scriptables/ScEngine.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_array.cpp (renamed from engines/wintermute/base/scriptables/SXArray.cpp) | 8 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_array.h (renamed from engines/wintermute/base/scriptables/SXArray.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_date.cpp (renamed from engines/wintermute/base/scriptables/SXDate.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_date.h (renamed from engines/wintermute/base/scriptables/SXDate.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_file.cpp (renamed from engines/wintermute/base/scriptables/SXFile.cpp) | 18 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_file.h (renamed from engines/wintermute/base/scriptables/SXFile.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_math.cpp (renamed from engines/wintermute/base/scriptables/SXMath.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_math.h (renamed from engines/wintermute/base/scriptables/SXMath.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp (renamed from engines/wintermute/base/scriptables/SXMemBuffer.cpp) | 10 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_mem_buffer.h (renamed from engines/wintermute/base/scriptables/SXMemBuffer.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_object.cpp (renamed from engines/wintermute/base/scriptables/SxObject.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_object.h (renamed from engines/wintermute/base/scriptables/SxObject.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_string.cpp (renamed from engines/wintermute/base/scriptables/SXString.cpp) | 12 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_string.h (renamed from engines/wintermute/base/scriptables/SXString.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_stack.cpp (renamed from engines/wintermute/base/scriptables/ScStack.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_stack.h (renamed from engines/wintermute/base/scriptables/ScStack.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_value.cpp (renamed from engines/wintermute/base/scriptables/ScValue.cpp) | 12 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_value.h (renamed from engines/wintermute/base/scriptables/ScValue.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/sound/base_sound.cpp (renamed from engines/wintermute/base/BSound.cpp) | 8 | ||||
-rw-r--r-- | engines/wintermute/base/sound/base_sound.h (renamed from engines/wintermute/base/BSound.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/sound/base_sound_buffer.cpp (renamed from engines/wintermute/base/BSoundBuffer.cpp) | 10 | ||||
-rw-r--r-- | engines/wintermute/base/sound/base_sound_buffer.h (renamed from engines/wintermute/base/BSoundBuffer.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/sound/base_sound_manager.cpp (renamed from engines/wintermute/base/BSoundMgr.cpp) | 14 | ||||
-rw-r--r-- | engines/wintermute/base/sound/base_sound_manager.h (renamed from engines/wintermute/base/BSoundMgr.h) | 2 |
116 files changed, 359 insertions, 357 deletions
diff --git a/engines/wintermute/base/BBase.cpp b/engines/wintermute/base/base.cpp index 76e1150925..5fabe94312 100644 --- a/engines/wintermute/base/BBase.cpp +++ b/engines/wintermute/base/base.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BBase.h b/engines/wintermute/base/base.h index e8c87f1f9e..e8c87f1f9e 100644 --- a/engines/wintermute/base/BBase.h +++ b/engines/wintermute/base/base.h diff --git a/engines/wintermute/base/BActiveRect.cpp b/engines/wintermute/base/base_active_rect.cpp index 836a93ad9a..5895b1acd5 100644 --- a/engines/wintermute/base/BActiveRect.cpp +++ b/engines/wintermute/base/base_active_rect.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BActiveRect.h b/engines/wintermute/base/base_active_rect.h index 935b91eaeb..7c9e8d4a39 100644 --- a/engines/wintermute/base/BActiveRect.h +++ b/engines/wintermute/base/base_active_rect.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BACTIVERECT_H
#define WINTERMUTE_BACTIVERECT_H
-#include "engines/wintermute/math/Rect32.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/math/rect32.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
class CBRegion;
diff --git a/engines/wintermute/base/BDebugger.cpp b/engines/wintermute/base/base_debugger.cpp index 92f282b6d1..f56f08dab2 100644 --- a/engines/wintermute/base/BDebugger.cpp +++ b/engines/wintermute/base/base_debugger.cpp @@ -26,7 +26,7 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BDebugger.h"
+#include "engines/wintermute/base/base_Debugger.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BDebugger.h b/engines/wintermute/base/base_debugger.h index cea432f7a8..35ea56eafe 100644 --- a/engines/wintermute/base/BDebugger.h +++ b/engines/wintermute/base/base_debugger.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BDEBUGGER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/wme_debugger.h"
// TODO: The entire debugger should possibly be removed
diff --git a/engines/wintermute/base/BDynBuffer.cpp b/engines/wintermute/base/base_dynamic_buffer.cpp index 9a2e071287..7453838219 100644 --- a/engines/wintermute/base/BDynBuffer.cpp +++ b/engines/wintermute/base/base_dynamic_buffer.cpp @@ -26,8 +26,8 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BDynBuffer.h b/engines/wintermute/base/base_dynamic_buffer.h index 66e8182c68..5795fe5bd1 100644 --- a/engines/wintermute/base/BDynBuffer.h +++ b/engines/wintermute/base/base_dynamic_buffer.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BDYNBUFFER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BFader.cpp b/engines/wintermute/base/base_fader.cpp index 9dec5e1e12..712f64eb6f 100644 --- a/engines/wintermute/base/BFader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFader.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/util.h"
diff --git a/engines/wintermute/base/BFader.h b/engines/wintermute/base/base_fader.h index cc90d4603d..679f5d0903 100644 --- a/engines/wintermute/base/BFader.h +++ b/engines/wintermute/base/base_fader.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFADER_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BFileManager.cpp b/engines/wintermute/base/base_file_manager.cpp index 34638f55e8..1cb0464a1f 100644 --- a/engines/wintermute/base/BFileManager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -27,17 +27,17 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/file/BDiskFile.h"
-#include "engines/wintermute/base/file/BSaveThumbFile.h"
-#include "engines/wintermute/base/file/BFileEntry.h"
-#include "engines/wintermute/base/file/BPackage.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/file/base_disk_file.h"
+#include "engines/wintermute/base/file/base_save_thumb_file.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
+#include "engines/wintermute/base/file/base_package.h"
#include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/BResources.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/file/base_resources.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/dcpackage.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/BFileManager.h b/engines/wintermute/base/base_file_manager.h index 7ea9ff5611..1bf3156ebe 100644 --- a/engines/wintermute/base/BFileManager.h +++ b/engines/wintermute/base/base_file_manager.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BFILEMANAGER_H
#define WINTERMUTE_BFILEMANAGER_H
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
#include "common/archive.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BFrame.cpp b/engines/wintermute/base/base_frame.cpp index d6d8a3aa5c..468ad29858 100644 --- a/engines/wintermute/base/BFrame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -27,17 +27,17 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sub_frame.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BFrame.h b/engines/wintermute/base/base_frame.h index 3d487b4ebc..f3dec4e16f 100644 --- a/engines/wintermute/base/BFrame.h +++ b/engines/wintermute/base/base_frame.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BFRAME_H
#define WINTERMUTE_BFRAME_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
#include "engines/wintermute/coll_templ.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BGame.cpp b/engines/wintermute/base/base_game.cpp index 3e577541b7..d5e9c99dcf 100644 --- a/engines/wintermute/base/BGame.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -27,40 +27,39 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFader.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
#include "engines/wintermute/base/gfx/base_image.h"
#include "engines/wintermute/base/gfx/base_surface.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BQuickMsg.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BSubFrame.h"
-
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BViewport.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_quick_msg.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_viewport.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
+#include "engines/wintermute/base/base_surface_storage.h"
#include "engines/wintermute/utils/crc.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/ui/UIWindow.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/video/VidPlayer.h"
-#include "engines/wintermute/video/VidTheoraPlayer.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/ui/ui_window.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/video/video_player.h"
+#include "engines/wintermute/video/video_theora_player.h"
#include "engines/wintermute/wintermute.h"
#include "common/savefile.h"
#include "common/textconsole.h"
diff --git a/engines/wintermute/base/BGame.h b/engines/wintermute/base/base_game.h index 7441d81b07..12ab07912b 100644 --- a/engines/wintermute/base/BGame.h +++ b/engines/wintermute/base/base_game.h @@ -29,12 +29,12 @@ #ifndef WINTERMUTE_BGAME_H
#define WINTERMUTE_BGAME_H
-#include "engines/wintermute/base/BDebugger.h"
+#include "engines/wintermute/base/base_Debugger.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/math/rect32.h"
#include "common/events.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BKeyboardState.cpp b/engines/wintermute/base/base_keyboard_state.cpp index 85ab15f58e..240f642b7f 100644 --- a/engines/wintermute/base/BKeyboardState.cpp +++ b/engines/wintermute/base/base_keyboard_state.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BKeyboardState.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/base_keyboard_state.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/system.h"
#include "common/keyboard.h"
diff --git a/engines/wintermute/base/BKeyboardState.h b/engines/wintermute/base/base_keyboard_state.h index e3a4a903f7..bdf268c601 100644 --- a/engines/wintermute/base/BKeyboardState.h +++ b/engines/wintermute/base/base_keyboard_state.h @@ -30,8 +30,8 @@ #define WINTERMUTE_BKEYBOARD_STATE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_scriptable.h"
#include "common/keyboard.h"
#include "common/events.h"
diff --git a/engines/wintermute/base/BNamedObject.cpp b/engines/wintermute/base/base_named_object.cpp index 9587da45e8..da76fb2047 100644 --- a/engines/wintermute/base/BNamedObject.cpp +++ b/engines/wintermute/base/base_named_object.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BNamedObject.h"
+#include "engines/wintermute/base/base_named_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BNamedObject.h b/engines/wintermute/base/base_named_object.h index 4d5fdb0c0e..c03d1417a3 100644 --- a/engines/wintermute/base/BNamedObject.h +++ b/engines/wintermute/base/base_named_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BNAMEDOBJECT_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BObject.cpp b/engines/wintermute/base/base_object.cpp index ed5d6fa5b7..0a4a0638f0 100644 --- a/engines/wintermute/base/BObject.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -27,15 +27,15 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BObject.h b/engines/wintermute/base/base_object.h index c855c770b7..70dc69f53d 100644 --- a/engines/wintermute/base/BObject.h +++ b/engines/wintermute/base/base_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BOBJECT_H
-#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/base_script_holder.h"
#include "engines/wintermute/persistent.h"
#include "common/events.h"
diff --git a/engines/wintermute/base/BParser.cpp b/engines/wintermute/base/base_parser.cpp index 80d3b58213..0f185636aa 100644 --- a/engines/wintermute/base/BParser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
#include "common/util.h"
diff --git a/engines/wintermute/base/BParser.h b/engines/wintermute/base/base_parser.h index ae886953a9..53a02c0f68 100644 --- a/engines/wintermute/base/BParser.h +++ b/engines/wintermute/base/base_parser.h @@ -52,7 +52,7 @@ #define PARSERR_EOF -2
#define PARSERR_TOKENNOTFOUND -1
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BPersistMgr.cpp b/engines/wintermute/base/base_persistence_manager.cpp index f8faced95f..743eaf355b 100644 --- a/engines/wintermute/base/BPersistMgr.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -27,15 +27,15 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BPersistMgr.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/math/Vector2.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/math/vector2.h"
+#include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/sound/base_sound.h"
#include "graphics/decoders/bmp.h"
#include "common/memstream.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BPersistMgr.h b/engines/wintermute/base/base_persistence_manager.h index 2e6ee8058c..f2fd42ceca 100644 --- a/engines/wintermute/base/BPersistMgr.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -30,8 +30,8 @@ #define WINTERMUTE_BPERSISTMGR_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
#include "engines/savestate.h"
#include "common/stream.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BPoint.cpp b/engines/wintermute/base/base_point.cpp index 4c80e154f2..6887349a7a 100644 --- a/engines/wintermute/base/BPoint.cpp +++ b/engines/wintermute/base/base_point.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_Point.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BPoint.h b/engines/wintermute/base/base_point.h index 3e4adb5d13..363ab1f919 100644 --- a/engines/wintermute/base/BPoint.h +++ b/engines/wintermute/base/base_point.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BPOINT_H
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BQuickMsg.cpp b/engines/wintermute/base/base_quick_msg.cpp index 32bd04afe2..ac1001a2fe 100644 --- a/engines/wintermute/base/BQuickMsg.cpp +++ b/engines/wintermute/base/base_quick_msg.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BQuickMsg.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_quick_msg.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BQuickMsg.h b/engines/wintermute/base/base_quick_msg.h index c247183714..9a68929932 100644 --- a/engines/wintermute/base/BQuickMsg.h +++ b/engines/wintermute/base/base_quick_msg.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BQUICKMSG_H
#define WINTERMUTE_BQUICKMSG_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BRegion.cpp b/engines/wintermute/base/base_region.cpp index c8ec87e04a..3e513f9fb8 100644 --- a/engines/wintermute/base/BRegion.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -27,14 +27,14 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
#include <limits.h>
diff --git a/engines/wintermute/base/BRegion.h b/engines/wintermute/base/base_region.h index 2a92d9daff..5de1fb9eef 100644 --- a/engines/wintermute/base/BRegion.h +++ b/engines/wintermute/base/base_region.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BREGION_H
#define WINTERMUTE_BREGION_H
-#include "engines/wintermute/base/BPoint.h"
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_Point.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BRegistry.cpp b/engines/wintermute/base/base_registry.cpp index fef09d7479..350a34b61e 100644 --- a/engines/wintermute/base/BRegistry.cpp +++ b/engines/wintermute/base/base_registry.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/tinyxml/tinyxml.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/utils/utils.h"
#include "common/config-manager.h"
#include "common/file.h"
diff --git a/engines/wintermute/base/BRegistry.h b/engines/wintermute/base/base_registry.h index 123d1d8a2f..06e052cd03 100644 --- a/engines/wintermute/base/BRegistry.h +++ b/engines/wintermute/base/base_registry.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BREGISTRY_H
#define WINTERMUTE_BREGISTRY_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSaveThumbHelper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp index 415d4ed1e4..bee63aa307 100644 --- a/engines/wintermute/base/BSaveThumbHelper.cpp +++ b/engines/wintermute/base/base_save_thumb_helper.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/base_save_thumb_helper.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSaveThumbHelper.h b/engines/wintermute/base/base_save_thumb_helper.h index 30db32cfb2..e8cdbdc00d 100644 --- a/engines/wintermute/base/BSaveThumbHelper.h +++ b/engines/wintermute/base/base_save_thumb_helper.h @@ -29,7 +29,7 @@ #define WINTERMUTE_BSAVETHUMBHELPER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptHolder.cpp b/engines/wintermute/base/base_script_holder.cpp index 65d37b2e5c..5192f76f6e 100644 --- a/engines/wintermute/base/BScriptHolder.cpp +++ b/engines/wintermute/base/base_script_holder.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/ad/AdGame.h"
-#include "engines/wintermute/base/BScriptHolder.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/ad/ad_game.h"
+#include "engines/wintermute/base/base_script_holder.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptHolder.h b/engines/wintermute/base/base_script_holder.h index 1e82b8cacf..0e5bc1b7ec 100644 --- a/engines/wintermute/base/BScriptHolder.h +++ b/engines/wintermute/base/base_script_holder.h @@ -31,7 +31,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptable.cpp b/engines/wintermute/base/base_scriptable.cpp index d1e3556a85..e9489fa407 100644 --- a/engines/wintermute/base/BScriptable.cpp +++ b/engines/wintermute/base/base_scriptable.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BScriptable.h b/engines/wintermute/base/base_scriptable.h index 534bd3bdf1..166f3c0bd1 100644 --- a/engines/wintermute/base/BScriptable.h +++ b/engines/wintermute/base/base_scriptable.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSCRIPTABLE_H
-#include "engines/wintermute/base/BNamedObject.h"
+#include "engines/wintermute/base/base_named_object.h"
#include "engines/wintermute/wme_debugger.h"
#include "engines/wintermute/persistent.h"
diff --git a/engines/wintermute/base/BSprite.cpp b/engines/wintermute/base/base_sprite.cpp index c4dfaa3f8d..ba55d1b88b 100644 --- a/engines/wintermute/base/BSprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -27,21 +27,21 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSprite.h b/engines/wintermute/base/base_sprite.h index 3c67e5f3fe..8f3ce84eb4 100644 --- a/engines/wintermute/base/BSprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -31,7 +31,7 @@ #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/base_script_holder.h"
namespace WinterMute {
class CBFrame;
diff --git a/engines/wintermute/base/BStringTable.cpp b/engines/wintermute/base/base_string_table.cpp index 470ae8549c..c7789add9d 100644 --- a/engines/wintermute/base/BStringTable.cpp +++ b/engines/wintermute/base/base_string_table.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BStringTable.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_string_table.h"
+#include "engines/wintermute/utils/string_util.h"
#include "common/str.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BStringTable.h b/engines/wintermute/base/base_string_table.h index 92d3604b4d..c612c33a41 100644 --- a/engines/wintermute/base/BStringTable.h +++ b/engines/wintermute/base/base_string_table.h @@ -31,7 +31,7 @@ #include "common/hashmap.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSubFrame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 858f2125c6..adce6c6b75 100644 --- a/engines/wintermute/base/BSubFrame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BActiveRect.h"
-#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_active_rect.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_surface_storage.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSubFrame.h b/engines/wintermute/base/base_sub_frame.h index 57ffcae675..6fb24c0e4f 100644 --- a/engines/wintermute/base/BSubFrame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -30,8 +30,8 @@ #define WINTERMUTE_BSUBFRAME_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
class CBObject;
diff --git a/engines/wintermute/base/BSurfaceStorage.cpp b/engines/wintermute/base/base_surface_storage.cpp index 406535cf39..06c2f1b0cc 100644 --- a/engines/wintermute/base/BSurfaceStorage.cpp +++ b/engines/wintermute/base/base_surface_storage.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_surface_storage.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/BSurfaceStorage.h b/engines/wintermute/base/base_surface_storage.h index c054c2a55b..58f25e6875 100644 --- a/engines/wintermute/base/BSurfaceStorage.h +++ b/engines/wintermute/base/base_surface_storage.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BSURFACESTORAGE_H
#define WINTERMUTE_BSURFACESTORAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "common/array.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BTransitionMgr.cpp b/engines/wintermute/base/base_transition_manager.cpp index 1cea7285bf..30a1a32e6a 100644 --- a/engines/wintermute/base/BTransitionMgr.cpp +++ b/engines/wintermute/base/base_transition_manager.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BTransitionMgr.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_transition_manager.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BTransitionMgr.h b/engines/wintermute/base/base_transition_manager.h index faedb6fe3e..9b84c653e9 100644 --- a/engines/wintermute/base/BTransitionMgr.h +++ b/engines/wintermute/base/base_transition_manager.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BTRANSITIONMGR_H
#define WINTERMUTE_BTRANSITIONMGR_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BViewport.cpp b/engines/wintermute/base/base_viewport.cpp index 2b237a0d38..83cbc5b0f0 100644 --- a/engines/wintermute/base/BViewport.cpp +++ b/engines/wintermute/base/base_viewport.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/base/base_viewport.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BViewport.h b/engines/wintermute/base/base_viewport.h index 1150b8ebe7..795e6f404f 100644 --- a/engines/wintermute/base/BViewport.h +++ b/engines/wintermute/base/base_viewport.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BVIEWPORT_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
class CBObject;
diff --git a/engines/wintermute/base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp index b787851290..3acde9c1ff 100644 --- a/engines/wintermute/base/file/BPkgFile.cpp +++ b/engines/wintermute/base/file/BPkgFile.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BPackage.h"
+#include "engines/wintermute/base/file/base_package.h"
#include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "common/util.h"
#include "common/file.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/file/BPkgFile.h b/engines/wintermute/base/file/BPkgFile.h index dc8b4b684f..4356ae5519 100644 --- a/engines/wintermute/base/file/BPkgFile.h +++ b/engines/wintermute/base/file/BPkgFile.h @@ -29,7 +29,10 @@ #ifndef WINTERMUTE_BPKGFILE_H
#define WINTERMUTE_BPKGFILE_H
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
+
+// This file is only needed until the next merge/rebase, as wrapCompressedStream now can set a known size
+// as such it is not renamed to follow the convention of the rest of the files.
namespace Common {
class SeekableReadStream;
diff --git a/engines/wintermute/base/file/BDiskFile.cpp b/engines/wintermute/base/file/base_disk_file.cpp index 739eafcc73..99bf9cff3f 100644 --- a/engines/wintermute/base/file/BDiskFile.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/wintypes.h"
#include "engines/wintermute/base/file/BPkgFile.h"
-#include "engines/wintermute/base/file/BDiskFile.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_disk_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "common/stream.h"
#include "common/memstream.h"
#include "common/file.h"
diff --git a/engines/wintermute/base/file/BDiskFile.h b/engines/wintermute/base/file/base_disk_file.h index 23e1a0a315..23e1a0a315 100644 --- a/engines/wintermute/base/file/BDiskFile.h +++ b/engines/wintermute/base/file/base_disk_file.h diff --git a/engines/wintermute/base/file/BFile.cpp b/engines/wintermute/base/file/base_file.cpp index 911039e36d..88a64cb147 100644 --- a/engines/wintermute/base/file/BFile.cpp +++ b/engines/wintermute/base/file/base_file.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/file/base_file.h"
#include "common/memstream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BFile.h b/engines/wintermute/base/file/base_file.h index d1737df0ce..b29fc41299 100644 --- a/engines/wintermute/base/file/BFile.h +++ b/engines/wintermute/base/file/base_file.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFILE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "common/str.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/file/BFileEntry.cpp b/engines/wintermute/base/file/base_file_entry.cpp index b00ecb6f9d..3b6f4c7c16 100644 --- a/engines/wintermute/base/file/BFileEntry.cpp +++ b/engines/wintermute/base/file/base_file_entry.cpp @@ -26,7 +26,7 @@ * Copyright (c) 2011 Jan Nedoma
*/
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/base_file_entry.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BFileEntry.h b/engines/wintermute/base/file/base_file_entry.h index 5fdf2b6308..ed80821004 100644 --- a/engines/wintermute/base/file/BFileEntry.h +++ b/engines/wintermute/base/file/base_file_entry.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFILEENTRY_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BPackage.cpp b/engines/wintermute/base/file/base_package.cpp index bddf1abc1e..fab6409c00 100644 --- a/engines/wintermute/base/file/BPackage.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BPackage.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_package.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "common/file.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/file/BPackage.h b/engines/wintermute/base/file/base_package.h index 8c803fddd9..52fc4f9677 100644 --- a/engines/wintermute/base/file/BPackage.h +++ b/engines/wintermute/base/file/base_package.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BPACKAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
namespace Common {
class SeekableReadStream;
diff --git a/engines/wintermute/base/BResources.cpp b/engines/wintermute/base/file/base_resources.cpp index 839be570c5..09cbae88fe 100644 --- a/engines/wintermute/base/BResources.cpp +++ b/engines/wintermute/base/file/base_resources.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BResources.h"
+#include "engines/wintermute/base/file/base_resources.h"
#include "common/str.h"
#include "common/memstream.h"
diff --git a/engines/wintermute/base/BResources.h b/engines/wintermute/base/file/base_resources.h index 6ec0541b5c..6ec0541b5c 100644 --- a/engines/wintermute/base/BResources.h +++ b/engines/wintermute/base/file/base_resources.h diff --git a/engines/wintermute/base/file/BSaveThumbFile.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp index 4a75b7d7ce..68200d3fc6 100644 --- a/engines/wintermute/base/file/BSaveThumbFile.cpp +++ b/engines/wintermute/base/file/base_save_thumb_file.cpp @@ -27,8 +27,8 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/file/BSaveThumbFile.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/file/base_save_thumb_file.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/file/BSaveThumbFile.h b/engines/wintermute/base/file/base_save_thumb_file.h index 5d33ac2220..42566581e2 100644 --- a/engines/wintermute/base/file/BSaveThumbFile.h +++ b/engines/wintermute/base/file/base_save_thumb_file.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSAVETHUMBFILE_H
-#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/file/base_file.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/font/BFont.cpp b/engines/wintermute/base/font/base_font.cpp index 5d0086c581..8976cfdabd 100644 --- a/engines/wintermute/base/font/BFont.cpp +++ b/engines/wintermute/base/font/base_font.cpp @@ -27,12 +27,12 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/font/BFontBitmap.h"
-#include "engines/wintermute/base/font/BFontTT.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/font/base_font_bitmap.h"
+#include "engines/wintermute/base/font/base_font_truetype.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/font/BFont.h b/engines/wintermute/base/font/base_font.h index a6ab757b0d..3df3090bb9 100644 --- a/engines/wintermute/base/font/BFont.h +++ b/engines/wintermute/base/font/base_font.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BFONT_H
#define WINTERMUTE_BFONT_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
#define NUM_CHARACTERS 256
diff --git a/engines/wintermute/base/font/BFontBitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 62576cdfea..ef730afb0a 100644 --- a/engines/wintermute/base/font/BFontBitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFontBitmap.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/font/base_font_bitmap.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_frame.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BFrame.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_frame.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/font/BFontBitmap.h b/engines/wintermute/base/font/base_font_bitmap.h index 17bf433f65..8af530cbc9 100644 --- a/engines/wintermute/base/font/BFontBitmap.h +++ b/engines/wintermute/base/font/base_font_bitmap.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFONTBITMAP_H
-#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/base_font.h"
namespace WinterMute {
class CBSubFrame;
diff --git a/engines/wintermute/base/font/BFontStorage.cpp b/engines/wintermute/base/font/base_font_storage.cpp index b5605cf2bc..13f779f2cb 100644 --- a/engines/wintermute/base/font/BFontStorage.cpp +++ b/engines/wintermute/base/font/base_font_storage.cpp @@ -27,9 +27,9 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/font/BFontStorage.h b/engines/wintermute/base/font/base_font_storage.h index 9759d5d25e..7c88e9a2f4 100644 --- a/engines/wintermute/base/font/BFontStorage.h +++ b/engines/wintermute/base/font/base_font_storage.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BFONTSTORAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
diff --git a/engines/wintermute/base/font/BFontTT.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 5f0c9fec1a..a52922fb76 100644 --- a/engines/wintermute/base/font/BFontTT.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/font/BFontTT.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/math/MathUtil.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/font/base_font_truetype.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/math/math_util.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BParser.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_parser.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/base/font/BFontTT.h b/engines/wintermute/base/font/base_font_truetype.h index 9b995b293e..4d8e71a3ff 100644 --- a/engines/wintermute/base/font/BFontTT.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BFONTTT_H
#define WINTERMUTE_BFONTTT_H
-#include "engines/wintermute/base/font/BFontStorage.h"
-#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/base_font_storage.h"
+#include "engines/wintermute/base/font/base_font.h"
#include "engines/wintermute/base/gfx/base_surface.h"
#include "common/rect.h"
#include "graphics/surface.h"
diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index f1e27c9622..fb6b23db2b 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -28,10 +28,10 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
+#include "engines/wintermute/utils/string_util.h"
#include "graphics/decoders/png.h"
#include "graphics/decoders/jpeg.h"
#include "graphics/decoders/bmp.h"
diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index 646a9ddd2d..6cda3e6b46 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BIMAGE_H
#define WINTERMUTE_BIMAGE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "graphics/surface.h"
#include "graphics/pixelformat.h"
#include "graphics/decoders/image_decoder.h"
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index 5c5ebd91b4..a8c19362f6 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/base_active_rect.h"
#include "engines/wintermute/base/gfx/base_renderer.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/BSubFrame.h"
-#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/base_sub_frame.h"
+#include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/platform_osystem.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 81c13f8b39..d743f19791 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -31,7 +31,7 @@ #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "common/rect.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp index 6c0ca40765..73b385d180 100644 --- a/engines/wintermute/base/gfx/base_surface.cpp +++ b/engines/wintermute/base/gfx/base_surface.cpp @@ -27,7 +27,7 @@ */
#include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/base_surface.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index f5fbd495aa..22c1fb83b8 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -29,8 +29,8 @@ #ifndef WINTERMUTE_BSURFACE_H
#define WINTERMUTE_BSURFACE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
#include "graphics/surface.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index ee971ab6c9..dbd2511928 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -28,15 +28,15 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
-#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/base_registry.h"
#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
-#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/base_surface_storage.h"
#include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/math/MathUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/math/math_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_sprite.h"
#include "common/system.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
#include "common/queue.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index 66c6e4a61a..87c5731b49 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
#include "engines/wintermute/base/gfx/base_image.h"
@@ -36,7 +36,7 @@ #include "graphics/decoders/png.h"
#include "graphics/decoders/bmp.h"
#include "graphics/decoders/jpeg.h"
-#include "engines/wintermute/graphics/transparentSurface.h"
+#include "engines/wintermute/graphics/transparent_surface.h"
#include "engines/wintermute/graphics/tga.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
diff --git a/engines/wintermute/base/particles/PartEmitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index 97de1fe044..11ebafd329 100644 --- a/engines/wintermute/base/particles/PartEmitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -27,15 +27,15 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/particles/PartParticle.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/particles/part_particle.h"
+#include "engines/wintermute/math/vector2.h"
#include "engines/wintermute/math/Matrix4.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BRegion.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_region.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/particles/PartEmitter.h b/engines/wintermute/base/particles/part_emitter.h index 5156783653..cff0a1ec83 100644 --- a/engines/wintermute/base/particles/PartEmitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -30,8 +30,8 @@ #define WINTERMUTE_PARTEMITTER_H
-#include "engines/wintermute/base/BObject.h"
-#include "engines/wintermute/base/particles/PartForce.h"
+#include "engines/wintermute/base/base_object.h"
+#include "engines/wintermute/base/particles/part_force.h"
namespace WinterMute {
class CBRegion;
diff --git a/engines/wintermute/base/particles/PartForce.cpp b/engines/wintermute/base/particles/part_force.cpp index b864c05292..2f330c21b0 100644 --- a/engines/wintermute/base/particles/PartForce.cpp +++ b/engines/wintermute/base/particles/part_force.cpp @@ -28,8 +28,8 @@ #include "engines/wintermute/dcgf.h"
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/particles/PartForce.h"
-#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/particles/part_force.h"
+#include "engines/wintermute/base/base_persistence_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/particles/PartForce.h b/engines/wintermute/base/particles/part_force.h index 640c8d7f20..f0a6d66c43 100644 --- a/engines/wintermute/base/particles/PartForce.h +++ b/engines/wintermute/base/particles/part_force.h @@ -30,9 +30,9 @@ #define WINTERMUTE_PARTFORCE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/base/BNamedObject.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/base/base_named_object.h"
+#include "engines/wintermute/math/vector2.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/particles/PartParticle.cpp b/engines/wintermute/base/particles/part_particle.cpp index 1439231993..931f7558c7 100644 --- a/engines/wintermute/base/particles/PartParticle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/particles/PartParticle.h"
-#include "engines/wintermute/base/particles/PartEmitter.h"
-#include "engines/wintermute/base/BSprite.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/particles/part_particle.h"
+#include "engines/wintermute/base/particles/part_emitter.h"
+#include "engines/wintermute/base/base_sprite.h"
+#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
diff --git a/engines/wintermute/base/particles/PartParticle.h b/engines/wintermute/base/particles/part_particle.h index ab5730d3c5..0b256d44ec 100644 --- a/engines/wintermute/base/particles/PartParticle.h +++ b/engines/wintermute/base/particles/part_particle.h @@ -30,9 +30,9 @@ #define WINTERMUTE_PARTPARTICLE_H
-#include "engines/wintermute/base/BBase.h"
-#include "engines/wintermute/math/Rect32.h"
-#include "engines/wintermute/math/Vector2.h"
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/math/rect32.h"
+#include "engines/wintermute/math/vector2.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScScript.cpp b/engines/wintermute/base/scriptables/script.cpp index 0b5b3c24bf..a9646e0045 100644 --- a/engines/wintermute/base/scriptables/ScScript.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/memstream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScScript.h b/engines/wintermute/base/scriptables/script.h index c031f8186f..899e1f3098 100644 --- a/engines/wintermute/base/scriptables/ScScript.h +++ b/engines/wintermute/base/scriptables/script.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCSCRIPT_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/dcscript.h" // Added by ClassView
#include "engines/wintermute/coll_templ.h"
diff --git a/engines/wintermute/base/scriptables/ScEngine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index db79a7d0e9..387093ac4a 100644 --- a/engines/wintermute/base/scriptables/ScEngine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScEngine.h b/engines/wintermute/base/scriptables/script_engine.h index 0322319b3d..81dc13a73c 100644 --- a/engines/wintermute/base/scriptables/ScEngine.h +++ b/engines/wintermute/base/scriptables/script_engine.h @@ -31,7 +31,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/wme_debugger.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/scriptables/SXArray.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp index 425118a3e7..a1b8249cb1 100644 --- a/engines/wintermute/base/scriptables/SXArray.cpp +++ b/engines/wintermute/base/scriptables/script_ext_array.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/system/SysInstance.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXArray.h b/engines/wintermute/base/scriptables/script_ext_array.h index 0f46bd546e..b873416572 100644 --- a/engines/wintermute/base/scriptables/SXArray.h +++ b/engines/wintermute/base/scriptables/script_ext_array.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_SXARRAY_H
#define WINTERMUTE_SXARRAY_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXDate.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp index cd705cc9d4..211c0d34f0 100644 --- a/engines/wintermute/base/scriptables/SXDate.cpp +++ b/engines/wintermute/base/scriptables/script_ext_date.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXDate.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_date.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXDate.h b/engines/wintermute/base/scriptables/script_ext_date.h index df0641983f..82f6af1f1d 100644 --- a/engines/wintermute/base/scriptables/SXDate.h +++ b/engines/wintermute/base/scriptables/script_ext_date.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXDATE_H
#include "common/system.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXFile.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 1924a42d72..58c0416b43 100644 --- a/engines/wintermute/base/scriptables/SXFile.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -26,17 +26,17 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/system/SysClassRegistry.h"
-#include "engines/wintermute/system/SysClass.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/SXFile.h"
+#include "engines/wintermute/base/scriptables/script_ext_file.h"
// Note: This code is completely untested, as I have yet to find a game that uses SXFile.
diff --git a/engines/wintermute/base/scriptables/SXFile.h b/engines/wintermute/base/scriptables/script_ext_file.h index 709d1f4378..5a6811fe57 100644 --- a/engines/wintermute/base/scriptables/SXFile.h +++ b/engines/wintermute/base/scriptables/script_ext_file.h @@ -30,7 +30,7 @@ #define WINTERMUTES_SXFILE_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
#include "common/stream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMath.cpp b/engines/wintermute/base/scriptables/script_ext_math.cpp index fb2838ee94..22b08087b7 100644 --- a/engines/wintermute/base/scriptables/SXMath.cpp +++ b/engines/wintermute/base/scriptables/script_ext_math.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/persistent.h"
#include "common/math.h"
#include <cmath>
diff --git a/engines/wintermute/base/scriptables/SXMath.h b/engines/wintermute/base/scriptables/script_ext_math.h index 4389de611f..422521233f 100644 --- a/engines/wintermute/base/scriptables/SXMath.h +++ b/engines/wintermute/base/scriptables/script_ext_math.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXMATH_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index 9ac98ab11d..df2bf188ff 100644 --- a/engines/wintermute/base/scriptables/SXMemBuffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -26,11 +26,11 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXMemBuffer.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h"
#include "common/file.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h index 09831bf464..a9d78e50e4 100644 --- a/engines/wintermute/base/scriptables/SXMemBuffer.h +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXMEMBUFFER_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SxObject.cpp b/engines/wintermute/base/scriptables/script_ext_object.cpp index ba961ed2ae..cb0d32d1a3 100644 --- a/engines/wintermute/base/scriptables/SxObject.cpp +++ b/engines/wintermute/base/scriptables/script_ext_object.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "SxObject.h"
-#include "ScValue.h"
-#include "ScStack.h"
+#include "engines/wintermute/base/scriptables/script_ext_object.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SxObject.h b/engines/wintermute/base/scriptables/script_ext_object.h index b4ec7c6cde..b4e869d5b3 100644 --- a/engines/wintermute/base/scriptables/SxObject.h +++ b/engines/wintermute/base/scriptables/script_ext_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXOBJECT_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXString.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index ed3d243cb0..bd7541fadd 100644 --- a/engines/wintermute/base/scriptables/SXString.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -26,13 +26,13 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/scriptables/SXString.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/scriptables/script_ext_string.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
+#include "engines/wintermute/utils/string_util.h"
#include "common/tokenizer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXString.h b/engines/wintermute/base/scriptables/script_ext_string.h index 348595ad29..52a1524dde 100644 --- a/engines/wintermute/base/scriptables/SXString.h +++ b/engines/wintermute/base/scriptables/script_ext_string.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXSTRING_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScStack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 252cd21dda..188cb2d15c 100644 --- a/engines/wintermute/base/scriptables/ScStack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScStack.h b/engines/wintermute/base/scriptables/script_stack.h index 22dae63060..6460f901fe 100644 --- a/engines/wintermute/base/scriptables/ScStack.h +++ b/engines/wintermute/base/scriptables/script_stack.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCSTACK_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
diff --git a/engines/wintermute/base/scriptables/ScValue.cpp b/engines/wintermute/base/scriptables/script_value.cpp index f38a12fc7a..da47ed299f 100644 --- a/engines/wintermute/base/scriptables/ScValue.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -27,12 +27,12 @@ */
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScValue.h b/engines/wintermute/base/scriptables/script_value.h index c66a60c22a..eaee3ed773 100644 --- a/engines/wintermute/base/scriptables/ScValue.h +++ b/engines/wintermute/base/scriptables/script_value.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCVALUE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/dcscript.h" // Added by ClassView
#include "engines/wintermute/wme_debugger.h"
diff --git a/engines/wintermute/base/BSound.cpp b/engines/wintermute/base/sound/base_sound.cpp index 2b54b39500..e1819e3c65 100644 --- a/engines/wintermute/base/BSound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -26,10 +26,10 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/BSound.h b/engines/wintermute/base/sound/base_sound.h index 9dc825e4ac..ef52194090 100644 --- a/engines/wintermute/base/BSound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_BSOUND_H
#define WINTERMUTE_BSOUND_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
#include "engines/wintermute/persistent.h"
#include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundBuffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index 4808cc9007..a868f99823 100644 --- a/engines/wintermute/base/BSoundBuffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
#include "audio/audiostream.h"
#include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundBuffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 9384670fbb..a491bd49ad 100644 --- a/engines/wintermute/base/BSoundBuffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSOUNDBUFFER_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "audio/mixer.h"
#include "common/stream.h"
diff --git a/engines/wintermute/base/BSoundMgr.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index 66baa633e4..c2174dea6a 100644 --- a/engines/wintermute/base/BSoundMgr.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -27,13 +27,13 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BSoundMgr.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BFileManager.h"
-#include "engines/wintermute/base/BSoundBuffer.h"
+#include "engines/wintermute/base/sound/base_sound_manager.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/utils/path_util.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/base_file_manager.h"
+#include "engines/wintermute/base/sound/base_sound_buffer.h"
#include "engines/wintermute/wintermute.h"
#include "common/config-manager.h"
#include "audio/mixer.h"
diff --git a/engines/wintermute/base/BSoundMgr.h b/engines/wintermute/base/sound/base_sound_manager.h index a021abadaa..2c05bbfcb8 100644 --- a/engines/wintermute/base/BSoundMgr.h +++ b/engines/wintermute/base/sound/base_sound_manager.h @@ -30,7 +30,7 @@ #define WINTERMUTE_BSOUNDMGR_H
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "audio/mixer.h"
#include "common/array.h"
|