WINTERMUTE: WinterMute -> Wintermute

53 files changed, 108 insertions, 108 deletions

diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index aa148c9c85..e180499ee0 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -45,7 +45,7 @@
 #include "engines/wintermute/base/particles/part_emitter.h"

 #include "engines/wintermute/base/base_engine.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdActor, false)

 

@@ -1457,4 +1457,4 @@ bool AdActor::playAnim(const char *filename) {
 	return AdTalkHolder::playAnim(filename);

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_actor.h b/engines/wintermute/ad/ad_actor.h
index 0c6334ac9d..4bc1bae37f 100644
--- a/engines/wintermute/ad/ad_actor.h
+++ b/engines/wintermute/ad/ad_actor.h
@@ -38,7 +38,7 @@
 #include "engines/wintermute/persistent.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdSpriteSet;

 class AdPath;

@@ -103,6 +103,6 @@ private:
 	int _pFCount;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif // WINTERMUTE_ADACTOR_H

diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index e6fde43697..5bf03d6062 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -52,7 +52,7 @@
 #include "engines/wintermute/base/particles/part_emitter.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdEntity, false)

 

@@ -1120,4 +1120,4 @@ bool AdEntity::setSprite(const char *filename) {
 	}

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_entity.h b/engines/wintermute/ad/ad_entity.h
index 9931327916..2178563534 100644
--- a/engines/wintermute/ad/ad_entity.h
+++ b/engines/wintermute/ad/ad_entity.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/ad/ad_talk_holder.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class VideoTheoraPlayer;

 class AdEntity : public AdTalkHolder {

 public:

@@ -63,6 +63,6 @@ public:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 3bda534a04..2971cdab00 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -62,7 +62,7 @@
 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdGame, true)

 

@@ -2279,4 +2279,4 @@ bool AdGame::onScriptShutdown(ScScript *script) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_game.h b/engines/wintermute/ad/ad_game.h
index 080aea40aa..5707ec48fd 100644
--- a/engines/wintermute/ad/ad_game.h
+++ b/engines/wintermute/ad/ad_game.h
@@ -31,7 +31,7 @@
 #include "engines/wintermute/ad/ad_types.h"

 #include "engines/wintermute/base/base_game.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class AdItem;

 class AdInventory;

 class AdSceneState;

@@ -158,6 +158,6 @@ private:
 	AdInventoryBox *_inventoryBox;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_inventory.cpp b/engines/wintermute/ad/ad_inventory.cpp
index 203a18ae32..282c37449b 100644
--- a/engines/wintermute/ad/ad_inventory.cpp
+++ b/engines/wintermute/ad/ad_inventory.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdInventory, false)

 

@@ -133,4 +133,4 @@ bool AdInventory::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_inventory.h b/engines/wintermute/ad/ad_inventory.h
index 9eff30454c..9a12eb1abe 100644
--- a/engines/wintermute/ad/ad_inventory.h
+++ b/engines/wintermute/ad/ad_inventory.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdItem;

 

@@ -47,6 +47,6 @@ public:
 	int _scrollOffset;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 555fa8e5c2..fd49860a5c 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -41,7 +41,7 @@
 #include "common/str.h"

 #include "common/rect.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdInventoryBox, false)

 

@@ -385,4 +385,4 @@ bool AdInventoryBox::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_inventory_box.h b/engines/wintermute/ad/ad_inventory_box.h
index 1857cd8f19..451ebf9635 100644
--- a/engines/wintermute/ad/ad_inventory_box.h
+++ b/engines/wintermute/ad/ad_inventory_box.h
@@ -32,7 +32,7 @@
 #include "engines/wintermute/base/base_object.h"

 #include "common/rect.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class UIButton;

 class UIWindow;

 

@@ -60,6 +60,6 @@ private:
 	int _itemWidth;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_item.cpp b/engines/wintermute/ad/ad_item.cpp
index cacafa826b..f5c8b16308 100644
--- a/engines/wintermute/ad/ad_item.cpp
+++ b/engines/wintermute/ad/ad_item.cpp
@@ -43,7 +43,7 @@
 #include "engines/wintermute/base/scriptables/script_value.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdItem, false)

 

@@ -810,4 +810,4 @@ bool AdItem::getExtendedFlag(const char *flagName) {
 	}

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_item.h b/engines/wintermute/ad/ad_item.h
index eaa6844fcd..e06266f8b7 100644
--- a/engines/wintermute/ad/ad_item.h
+++ b/engines/wintermute/ad/ad_item.h
@@ -32,7 +32,7 @@
 

 #include "engines/wintermute/ad/ad_talk_holder.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdItem : public AdTalkHolder {

 public:

@@ -64,6 +64,6 @@ private:
 	char *_amountString;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 5742c9fc85..2cec37bec1 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -38,7 +38,7 @@
 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdLayer, false)

 

@@ -563,4 +563,4 @@ bool AdLayer::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_layer.h b/engines/wintermute/ad/ad_layer.h
index 6d1686e1a6..b01079c091 100644
--- a/engines/wintermute/ad/ad_layer.h
+++ b/engines/wintermute/ad/ad_layer.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADLAYER_H

 #define WINTERMUTE_ADLAYER_H

 

-namespace WinterMute {

+namespace Wintermute {

 class AdSceneNode;

 class AdLayer : public BaseObject {

 public:

@@ -53,6 +53,6 @@ public:
 	virtual const char *scToString();

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_node_state.cpp b/engines/wintermute/ad/ad_node_state.cpp
index 4784d6d331..fb2dfed0f5 100644
--- a/engines/wintermute/ad/ad_node_state.cpp
+++ b/engines/wintermute/ad/ad_node_state.cpp
@@ -35,7 +35,7 @@
 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdNodeState, false)

 

@@ -193,4 +193,4 @@ bool AdNodeState::transferEntity(AdEntity *entity, bool includingSprites, bool s
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_node_state.h b/engines/wintermute/ad/ad_node_state.h
index ce15bc893f..0008d4b3ee 100644
--- a/engines/wintermute/ad/ad_node_state.h
+++ b/engines/wintermute/ad/ad_node_state.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADNODESTATE_H

 #define WINTERMUTE_ADNODESTATE_H

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdEntity;

 

@@ -55,6 +55,6 @@ private:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index aaf4c6db4a..59781087a3 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -52,7 +52,7 @@
 #include "common/str.h"

 #include "common/util.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdObject, false)

 

@@ -1296,4 +1296,4 @@ bool AdObject::updatePartEmitter() {
 	return _partEmitter->update();

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_object.h b/engines/wintermute/ad/ad_object.h
index 8e4cb80742..9451707445 100644
--- a/engines/wintermute/ad/ad_object.h
+++ b/engines/wintermute/ad/ad_object.h
@@ -32,7 +32,7 @@
 #include "engines/wintermute/ad/ad_types.h"

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdWaypointGroup;

 class AdRegion;

@@ -119,6 +119,6 @@ protected:
 	bool getScale(float *scaleX, float *scaleY);

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_path.cpp b/engines/wintermute/ad/ad_path.cpp
index 89eb3f29fa..0c0ec63e0f 100644
--- a/engines/wintermute/ad/ad_path.cpp
+++ b/engines/wintermute/ad/ad_path.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/ad/ad_path.h"

 #include "engines/wintermute/base/base_point.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdPath, false)

 

@@ -117,4 +117,4 @@ bool AdPath::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_path.h b/engines/wintermute/ad/ad_path.h
index 8622e6757c..b85e1fce7a 100644
--- a/engines/wintermute/ad/ad_path.h
+++ b/engines/wintermute/ad/ad_path.h
@@ -33,7 +33,7 @@
 #include "engines/wintermute/coll_templ.h"

 #include "engines/wintermute/base/base.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class BasePoint;

 class AdPath : public BaseClass {

 public:

@@ -51,6 +51,6 @@ public:
 	bool _ready;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_path_point.cpp b/engines/wintermute/ad/ad_path_point.cpp
index d5d447eb9a..1fb954c668 100644
--- a/engines/wintermute/ad/ad_path_point.cpp
+++ b/engines/wintermute/ad/ad_path_point.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/ad/ad_path_point.h"

 #include "engines/wintermute/base/base_persistence_manager.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdPathPoint, false)

 

@@ -72,4 +72,4 @@ bool AdPathPoint::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_path_point.h b/engines/wintermute/ad/ad_path_point.h
index ea0a5795d0..8201750cef 100644
--- a/engines/wintermute/ad/ad_path_point.h
+++ b/engines/wintermute/ad/ad_path_point.h
@@ -32,7 +32,7 @@
 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/base/base_point.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdPathPoint : public BasePoint {

 public:

@@ -45,6 +45,6 @@ public:
 	int _distance;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_region.cpp b/engines/wintermute/ad/ad_region.cpp
index 5ecb24c5b7..3b9d4fadda 100644
--- a/engines/wintermute/ad/ad_region.cpp
+++ b/engines/wintermute/ad/ad_region.cpp
@@ -34,7 +34,7 @@
 #include "engines/wintermute/base/base_game.h"

 #include "engines/wintermute/base/base_file_manager.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdRegion, false)

 

@@ -395,4 +395,4 @@ bool AdRegion::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_region.h b/engines/wintermute/ad/ad_region.h
index 7ee36dc970..5c33291a88 100644
--- a/engines/wintermute/ad/ad_region.h
+++ b/engines/wintermute/ad/ad_region.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/base/base_region.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdRegion : public BaseRegion {

 public:

@@ -53,6 +53,6 @@ public:
 	virtual const char *scToString();

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_response.cpp b/engines/wintermute/ad/ad_response.cpp
index 9cfa181b1c..f7886bba5a 100644
--- a/engines/wintermute/ad/ad_response.cpp
+++ b/engines/wintermute/ad/ad_response.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/utils/utils.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdResponse, false)

 

@@ -143,4 +143,4 @@ bool AdResponse::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_response.h b/engines/wintermute/ad/ad_response.h
index 0cb8f6628b..0678ef5a37 100644
--- a/engines/wintermute/ad/ad_response.h
+++ b/engines/wintermute/ad/ad_response.h
@@ -33,7 +33,7 @@
 #include "engines/wintermute/base/base_object.h"

 #include "engines/wintermute/ad/ad_types.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class BaseFont;

 class AdResponse : public BaseObject {

 public:

@@ -56,6 +56,6 @@ public:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 5f2a1dc825..d467509612 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -45,7 +45,7 @@
 #include "engines/wintermute/wintermute.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdResponseBox, false)

 

@@ -611,7 +611,7 @@ bool AdResponseBox::weedResponses() {
 			}

 			break;

 		default:

-			debugC(kWinterMuteDebugGeneral, "AdResponseBox::WeedResponses - Unhandled enum");

+			debugC(kWintermuteDebugGeneral, "AdResponseBox::WeedResponses - Unhandled enum");

 			break;

 		}

 	}

@@ -641,7 +641,7 @@ bool AdResponseBox::handleResponse(AdResponse *response) {
 		adGame->addGameResponse(response->_iD);

 		break;

 	default:

-		debugC(kWinterMuteDebugGeneral, "AdResponseBox::HandleResponse - Unhandled enum");

+		debugC(kWintermuteDebugGeneral, "AdResponseBox::HandleResponse - Unhandled enum");

 	}

 

 	return STATUS_OK;

@@ -708,4 +708,4 @@ bool AdResponseBox::getObjects(BaseArray<UIObject *> &objects, bool interactiveO
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_response_box.h b/engines/wintermute/ad/ad_response_box.h
index c1f60ba6ae..99522f00f6 100644
--- a/engines/wintermute/ad/ad_response_box.h
+++ b/engines/wintermute/ad/ad_response_box.h
@@ -32,7 +32,7 @@
 

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class UIButton;

 class UIWindow;

@@ -82,6 +82,6 @@ public:
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent);

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_response_context.cpp b/engines/wintermute/ad/ad_response_context.cpp
index 175a7f8491..0a2eff842d 100644
--- a/engines/wintermute/ad/ad_response_context.cpp
+++ b/engines/wintermute/ad/ad_response_context.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/ad/ad_response_context.h"

 #include "engines/wintermute/base/base_persistence_manager.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdResponseContext, false)

 

@@ -68,4 +68,4 @@ void AdResponseContext::setContext(const char *context) {
 	}

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_response_context.h b/engines/wintermute/ad/ad_response_context.h
index d5c8bb3fa3..a630f975e4 100644
--- a/engines/wintermute/ad/ad_response_context.h
+++ b/engines/wintermute/ad/ad_response_context.h
@@ -32,7 +32,7 @@
 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/base/base.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdResponseContext : public BaseClass {

 public:

@@ -45,6 +45,6 @@ public:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_rot_level.cpp b/engines/wintermute/ad/ad_rot_level.cpp
index 28c37b5b81..487e1f7067 100644
--- a/engines/wintermute/ad/ad_rot_level.cpp
+++ b/engines/wintermute/ad/ad_rot_level.cpp
@@ -33,7 +33,7 @@
 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/base/base_file_manager.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdRotLevel, false)

 

@@ -158,4 +158,4 @@ bool AdRotLevel::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_rot_level.h b/engines/wintermute/ad/ad_rot_level.h
index 4339a379a5..7951c7562d 100644
--- a/engines/wintermute/ad/ad_rot_level.h
+++ b/engines/wintermute/ad/ad_rot_level.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdRotLevel : public BaseObject {

 public:

@@ -44,6 +44,6 @@ public:
 	bool loadBuffer(byte *buffer, bool complete = true);

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_scale_level.cpp b/engines/wintermute/ad/ad_scale_level.cpp
index 430be3559d..f3ec68dd64 100644
--- a/engines/wintermute/ad/ad_scale_level.cpp
+++ b/engines/wintermute/ad/ad_scale_level.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/base/base_game.h"

 #include "engines/wintermute/base/base_file_manager.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdScaleLevel, false)

 

@@ -156,4 +156,4 @@ bool AdScaleLevel::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_scale_level.h b/engines/wintermute/ad/ad_scale_level.h
index 5e84f8c9ce..41a2edf8c5 100644
--- a/engines/wintermute/ad/ad_scale_level.h
+++ b/engines/wintermute/ad/ad_scale_level.h
@@ -32,7 +32,7 @@
 

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdScaleLevel : public BaseObject {

 public:

@@ -45,6 +45,6 @@ public:
 	bool loadBuffer(byte *buffer, bool complete = true);

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index d99b6b7fb8..19968d41dc 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -60,7 +60,7 @@
 #include "engines/wintermute/wintermute.h"

 #include <limits.h>

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdScene, false)

 

@@ -2937,7 +2937,7 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOn
 			}

 			break;

 			default:

-				debugC(kWinterMuteDebugGeneral, "AdScene::GetSceneObjects - Unhandled enum");

+				debugC(kWintermuteDebugGeneral, "AdScene::GetSceneObjects - Unhandled enum");

 				break;

 			}

 		}

@@ -2999,4 +2999,4 @@ bool AdScene::getRegionObjects(AdRegion *region, BaseArray<AdObject *> &objects,
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index 5c2f505001..20b3f5026d 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/base/base_fader.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class UIWindow;

 class AdObject;

@@ -176,6 +176,6 @@ private:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_scene_node.cpp b/engines/wintermute/ad/ad_scene_node.cpp
index 87b2c25406..4f6acdbc95 100644
--- a/engines/wintermute/ad/ad_scene_node.cpp
+++ b/engines/wintermute/ad/ad_scene_node.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/ad/ad_scene_node.h"

 #include "engines/wintermute/base/base_game.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdSceneNode, false)

 

@@ -79,4 +79,4 @@ bool AdSceneNode::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_scene_node.h b/engines/wintermute/ad/ad_scene_node.h
index b56c351bc8..8cc50b86c4 100644
--- a/engines/wintermute/ad/ad_scene_node.h
+++ b/engines/wintermute/ad/ad_scene_node.h
@@ -34,7 +34,7 @@
 #include "engines/wintermute/ad/ad_region.h"   // Added by ClassView

 #include "engines/wintermute/ad/ad_entity.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdSceneNode : public BaseObject {

 public:

diff --git a/engines/wintermute/ad/ad_scene_state.cpp b/engines/wintermute/ad/ad_scene_state.cpp
index eafb1f96b6..4a85148540 100644
--- a/engines/wintermute/ad/ad_scene_state.cpp
+++ b/engines/wintermute/ad/ad_scene_state.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/platform_osystem.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdSceneState, false)

 

@@ -92,4 +92,4 @@ AdNodeState *AdSceneState::getNodeState(const char *name, bool saving) {
 	}

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_scene_state.h b/engines/wintermute/ad/ad_scene_state.h
index 8f1bdb8fd2..8298d23d76 100644
--- a/engines/wintermute/ad/ad_scene_state.h
+++ b/engines/wintermute/ad/ad_scene_state.h
@@ -33,7 +33,7 @@
 #include "engines/wintermute/base/base.h"

 #include "engines/wintermute/coll_templ.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class AdNodeState;

 class AdSceneState : public BaseClass {

 public:

@@ -46,6 +46,6 @@ public:
 	BaseArray<AdNodeState *> _nodeStates;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_sentence.cpp b/engines/wintermute/ad/ad_sentence.cpp
index 60c4519823..0c3080c9cd 100644
--- a/engines/wintermute/ad/ad_sentence.cpp
+++ b/engines/wintermute/ad/ad_sentence.cpp
@@ -38,7 +38,7 @@
 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/base/base_file_manager.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdSentence, false)

 

@@ -357,4 +357,4 @@ bool AdSentence::canSkip() {
 	return (_gameRef->_timer - _startTime) > 300;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_sentence.h b/engines/wintermute/ad/ad_sentence.h
index ae4ee793d5..85be09094c 100644
--- a/engines/wintermute/ad/ad_sentence.h
+++ b/engines/wintermute/ad/ad_sentence.h
@@ -36,7 +36,7 @@
 #include "engines/wintermute/dctypes.h"    // Added by ClassView

 #include "common/rect.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class AdTalkDef;

 class BaseFont;

 class BaseSprite;

@@ -80,6 +80,6 @@ private:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_sprite_set.cpp b/engines/wintermute/ad/ad_sprite_set.cpp
index df10418d95..5b605d6e32 100644
--- a/engines/wintermute/ad/ad_sprite_set.cpp
+++ b/engines/wintermute/ad/ad_sprite_set.cpp
@@ -33,7 +33,7 @@
 #include "engines/wintermute/base/base_file_manager.h"

 #include "engines/wintermute/base/base_sprite.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdSpriteSet, false)

 

@@ -353,4 +353,4 @@ bool AdSpriteSet::containsSprite(BaseSprite *sprite) {
 	return false;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_sprite_set.h b/engines/wintermute/ad/ad_sprite_set.h
index 555ab914cf..3855114850 100644
--- a/engines/wintermute/ad/ad_sprite_set.h
+++ b/engines/wintermute/ad/ad_sprite_set.h
@@ -32,7 +32,7 @@
 

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class BaseSprite;

 class AdSpriteSet : public BaseObject {

 public:

@@ -48,6 +48,6 @@ public:
 	BaseSprite *_sprites[NUM_DIRECTIONS];

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_talk_def.cpp b/engines/wintermute/ad/ad_talk_def.cpp
index 71d8d6b1c3..08136d787e 100644
--- a/engines/wintermute/ad/ad_talk_def.cpp
+++ b/engines/wintermute/ad/ad_talk_def.cpp
@@ -36,7 +36,7 @@
 #include "engines/wintermute/base/base_file_manager.h"

 #include "engines/wintermute/utils/utils.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdTalkDef, false)

 

@@ -282,4 +282,4 @@ BaseSprite *AdTalkDef::getDefaultSprite(TDirection dir) {
 	}

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_talk_def.h b/engines/wintermute/ad/ad_talk_def.h
index 4d28881e97..f748aa4e7a 100644
--- a/engines/wintermute/ad/ad_talk_def.h
+++ b/engines/wintermute/ad/ad_talk_def.h
@@ -32,7 +32,7 @@
 #include "engines/wintermute/coll_templ.h"

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class AdTalkNode;

 class AdSpriteSet;

 class AdTalkDef : public BaseObject {

@@ -53,6 +53,6 @@ public:
 	virtual bool saveAsText(BaseDynamicBuffer *buffer, int indent = 0);

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_talk_holder.cpp b/engines/wintermute/ad/ad_talk_holder.cpp
index a5ab7f3a6d..165ee50270 100644
--- a/engines/wintermute/ad/ad_talk_holder.cpp
+++ b/engines/wintermute/ad/ad_talk_holder.cpp
@@ -37,7 +37,7 @@
 #include "engines/wintermute/base/base_engine.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdTalkHolder, false)

 

@@ -399,4 +399,4 @@ bool AdTalkHolder::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_talk_holder.h b/engines/wintermute/ad/ad_talk_holder.h
index 2607fdd9da..906c469b32 100644
--- a/engines/wintermute/ad/ad_talk_holder.h
+++ b/engines/wintermute/ad/ad_talk_holder.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/ad/ad_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class AdTalkHolder : public AdObject {

 public:

@@ -52,6 +52,6 @@ public:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_talk_node.cpp b/engines/wintermute/ad/ad_talk_node.cpp
index 14c1c3f459..6d793f483c 100644
--- a/engines/wintermute/ad/ad_talk_node.cpp
+++ b/engines/wintermute/ad/ad_talk_node.cpp
@@ -33,7 +33,7 @@
 #include "engines/wintermute/base/base_sprite.h"

 #include "engines/wintermute/ad/ad_sprite_set.h"

 #include "engines/wintermute/utils/utils.h"

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdTalkNode, false)

 

@@ -292,4 +292,4 @@ BaseSprite *AdTalkNode::getSprite(TDirection dir) {
 	}

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_talk_node.h b/engines/wintermute/ad/ad_talk_node.h
index 9e599b6af2..863f6d0a3b 100644
--- a/engines/wintermute/ad/ad_talk_node.h
+++ b/engines/wintermute/ad/ad_talk_node.h
@@ -32,7 +32,7 @@
 #include "engines/wintermute/persistent.h"

 #include "engines/wintermute/base/base.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class AdSpriteSet;

 class BaseSprite;

 class AdTalkNode : public BaseClass {

@@ -58,6 +58,6 @@ public:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/ad/ad_types.h b/engines/wintermute/ad/ad_types.h
index 18892919c6..17152ca5e8 100644
--- a/engines/wintermute/ad/ad_types.h
+++ b/engines/wintermute/ad/ad_types.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADTYPES_H

 #define WINTERMUTE_ADTYPES_H

 

-namespace WinterMute {

+namespace Wintermute {

 

 typedef enum {

     GAME_NORMAL,

@@ -102,6 +102,6 @@ typedef enum {
     GEOM_GENERIC

 } TGeomNodeType;

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif // WINTERMUTE_ADTYPES_H

diff --git a/engines/wintermute/ad/ad_waypoint_group.cpp b/engines/wintermute/ad/ad_waypoint_group.cpp
index 0f83c2c50b..1573f5914e 100644
--- a/engines/wintermute/ad/ad_waypoint_group.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group.cpp
@@ -35,7 +35,7 @@
 #include "engines/wintermute/base/base_file_manager.h"

 #include <limits.h>

 

-namespace WinterMute {

+namespace Wintermute {

 

 IMPLEMENT_PERSISTENT(AdWaypointGroup, false)

 

@@ -267,4 +267,4 @@ bool AdWaypointGroup::mimic(AdWaypointGroup *wpt, float scale, int argX, int arg
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/ad/ad_waypoint_group.h b/engines/wintermute/ad/ad_waypoint_group.h
index 7d69ab8237..a83c942652 100644
--- a/engines/wintermute/ad/ad_waypoint_group.h
+++ b/engines/wintermute/ad/ad_waypoint_group.h
@@ -31,7 +31,7 @@
 

 #include "engines/wintermute/base/base_object.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class BasePoint;

 class AdWaypointGroup : public BaseObject {

 public:

@@ -53,6 +53,6 @@ public:
 	virtual bool scSetProperty(const char *name, ScValue *value);

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif