diff options
| author | Einar Johan Trøan Sømåen | 2012-08-13 03:42:30 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-13 03:42:30 +0200 |
| commit | fed19cb66ae5b56dd7dc81b90edd5a0d15986678 (patch) | |
| tree | d1c3a237aa6b421aedea2cb3bab88b8689dea4a1 | |
| parent | ddfa227b939d922f738f932997b70110453068cf (diff) | |
| download | scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.gz scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.bz2 scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.zip | |
WINTERMUTE: WinterMute -> Wintermute
227 files changed, 539 insertions, 539 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
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp index 8fa26f04a6..11f308a522 100644 --- a/engines/wintermute/base/base.cpp +++ b/engines/wintermute/base/base.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base_parser.h"
#include "engines/wintermute/base/base_dynamic_buffer.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseClass::BaseClass(BaseGame *gameOwner) {
@@ -182,4 +182,4 @@ bool BaseClass::saveAsText(BaseDynamicBuffer *buffer, int indent) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base.h b/engines/wintermute/base/base.h index dcd186be42..b1b184b2f4 100644 --- a/engines/wintermute/base/base.h +++ b/engines/wintermute/base/base.h @@ -35,7 +35,7 @@ #include "common/hashmap.h"
#include "common/hash-str.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseGame;
class BaseDynamicBuffer;
@@ -59,6 +59,6 @@ protected: std::map<std::string, std::string>::iterator _editorPropsIter;*/
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_active_rect.cpp b/engines/wintermute/base/base_active_rect.cpp index a895735725..46870a0d29 100644 --- a/engines/wintermute/base/base_active_rect.cpp +++ b/engines/wintermute/base/base_active_rect.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base_region.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseActiveRect::BaseActiveRect(BaseGame *inGame) : BaseClass(inGame) {
@@ -107,4 +107,4 @@ void BaseActiveRect::clipRect() { BasePlatform::intersectRect(&_rect, &_rect, &rc);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_active_rect.h b/engines/wintermute/base/base_active_rect.h index 0885b0e13e..b446dadcce 100644 --- a/engines/wintermute/base/base_active_rect.h +++ b/engines/wintermute/base/base_active_rect.h @@ -32,7 +32,7 @@ #include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseRegion;
class BaseSubFrame;
class BaseObject;
@@ -55,6 +55,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_dynamic_buffer.cpp b/engines/wintermute/base/base_dynamic_buffer.cpp index d953483be8..0a7a214ba4 100644 --- a/engines/wintermute/base/base_dynamic_buffer.cpp +++ b/engines/wintermute/base/base_dynamic_buffer.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_engine.h"
#include "engines/wintermute/base/base_dynamic_buffer.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseDynamicBuffer::BaseDynamicBuffer(BaseGame *inGame, uint32 initSize, uint32 growBy) {
@@ -201,4 +201,4 @@ void BaseDynamicBuffer::putTextForm(const char *format, va_list argptr) { putBytes((byte *)buff, strlen(buff));
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_dynamic_buffer.h b/engines/wintermute/base/base_dynamic_buffer.h index ff3897e71b..8285b472b2 100644 --- a/engines/wintermute/base/base_dynamic_buffer.h +++ b/engines/wintermute/base/base_dynamic_buffer.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseDynamicBuffer {
public:
@@ -61,6 +61,6 @@ private: void putTextForm(const char *format, va_list argptr);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_engine.cpp b/engines/wintermute/base/base_engine.cpp index c31777c866..3447407866 100644 --- a/engines/wintermute/base/base_engine.cpp +++ b/engines/wintermute/base/base_engine.cpp @@ -33,10 +33,10 @@ #include "engines/wintermute/system/sys_class_registry.h" #include "common/system.h" namespace Common { -DECLARE_SINGLETON(WinterMute::BaseEngine); +DECLARE_SINGLETON(Wintermute::BaseEngine); } -namespace WinterMute { +namespace Wintermute { BaseEngine::BaseEngine() { _fileManager = NULL; @@ -49,7 +49,7 @@ BaseEngine::BaseEngine() { void BaseEngine::init() { _fileManager = new BaseFileManager(); // Don't forget to register your random source - _rnd = new Common::RandomSource("WinterMute"); + _rnd = new Common::RandomSource("Wintermute"); _classReg = new SystemClassRegistry(); _classReg->registerClasses(); } @@ -82,7 +82,7 @@ void BaseEngine::LOG(bool res, const char *fmt, ...) { if (instance()._gameRef) { instance()._gameRef->LOG("%s", buff); } else { - debugCN(kWinterMuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff); + debugCN(kWintermuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff); } } @@ -90,4 +90,4 @@ uint32 BaseEngine::randInt(int from, int to) { return _rnd->getRandomNumberRng(from, to); } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/base_engine.h b/engines/wintermute/base/base_engine.h index 04199715af..32007ef571 100644 --- a/engines/wintermute/base/base_engine.h +++ b/engines/wintermute/base/base_engine.h @@ -33,13 +33,13 @@ #include "common/singleton.h" #include "common/random.h" -namespace WinterMute { +namespace Wintermute { class BaseFileManager; class BaseRegistry; class BaseGame; class SystemClassRegistry; -class BaseEngine : public Common::Singleton<WinterMute::BaseEngine> { +class BaseEngine : public Common::Singleton<Wintermute::BaseEngine> { void init(); BaseFileManager *_fileManager; Common::String _gameId; @@ -63,6 +63,6 @@ public: const char *getGameId() { return _gameId.c_str(); } }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp index 4bc166f841..580a7afeb4 100644 --- a/engines/wintermute/base/base_fader.cpp +++ b/engines/wintermute/base/base_fader.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/base_game.h"
#include "common/util.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -191,4 +191,4 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_fader.h b/engines/wintermute/base/base_fader.h index 4401bd0ebd..34d0e7d3da 100644 --- a/engines/wintermute/base/base_fader.h +++ b/engines/wintermute/base/base_fader.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_object.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFader : public BaseObject {
public:
@@ -58,6 +58,6 @@ private: uint32 _startTime;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp index c17a456f11..f7a3b6a3fb 100644 --- a/engines/wintermute/base/base_file_manager.cpp +++ b/engines/wintermute/base/base_file_manager.cpp @@ -46,7 +46,7 @@ #include "common/savefile.h"
#include "common/fs.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -88,20 +88,20 @@ byte *BaseFileManager::readWholeFile(const Common::String &filename, uint32 *siz Common::SeekableReadStream *file = openFile(filename);
if (!file) {
if (mustExist) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Error opening file '%s'", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error opening file '%s'", filename.c_str());
}
return NULL;
}
buffer = new byte[file->size() + 1];
if (buffer == NULL) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Error allocating buffer for file '%s' (%d bytes)", filename.c_str(), file->size() + 1);
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error allocating buffer for file '%s' (%d bytes)", filename.c_str(), file->size() + 1);
closeFile(file);
return NULL;
}
if (file->read(buffer, (uint32)file->size()) != (uint32)file->size()) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Error reading file '%s'", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Error reading file '%s'", filename.c_str());
closeFile(file);
delete[] buffer;
return NULL;
@@ -165,7 +165,7 @@ bool BaseFileManager::initPaths() { bool BaseFileManager::registerPackages(const Common::FSList &fslist) {
for (Common::FSList::const_iterator it = fslist.begin(); it != fslist.end(); it++) {
- debugC(kWinterMuteDebugFileAccess, "Adding %s", (*it).getName().c_str());
+ debugC(kWintermuteDebugFileAccess, "Adding %s", (*it).getName().c_str());
if ((*it).getName().contains(".dcp")) {
if (registerPackage((*it))) {
addPath(PATH_PACKAGE, (*it));
@@ -177,13 +177,13 @@ bool BaseFileManager::registerPackages(const Common::FSList &fslist) { //////////////////////////////////////////////////////////////////////////
bool BaseFileManager::registerPackages() {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "Scanning packages");
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "Scanning packages");
// Register without using SearchMan, as otherwise the FSNode-based lookup in openPackage will fail
// and that has to be like that to support the detection-scheme.
Common::FSList files;
for (Common::FSList::iterator it = _packagePaths.begin(); it != _packagePaths.end(); it++) {
- debugC(kWinterMuteDebugFileAccess, "Should register folder: %s %s", (*it).getPath().c_str(), (*it).getName().c_str());
+ debugC(kWintermuteDebugFileAccess, "Should register folder: %s %s", (*it).getPath().c_str(), (*it).getName().c_str());
(*it).getChildren(files, Common::FSNode::kListFilesOnly);
for (Common::FSList::iterator fileIt = files.begin(); fileIt != files.end(); fileIt++) {
if (!fileIt->getName().hasSuffix(".dcp")) {
@@ -198,12 +198,12 @@ bool BaseFileManager::registerPackages() { continue;
}
}
- debugC(kWinterMuteDebugFileAccess, "Registering %s %s", (*fileIt).getPath().c_str(), (*fileIt).getName().c_str());
+ debugC(kWintermuteDebugFileAccess, "Registering %s %s", (*fileIt).getPath().c_str(), (*fileIt).getName().c_str());
registerPackage((*fileIt));
}
}
-// debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, " Registered %d files in %d package(s)", _files.size(), _packages.size());
+// debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, " Registered %d files in %d package(s)", _files.size(), _packages.size());
return STATUS_OK;
}
@@ -263,7 +263,7 @@ Common::SeekableReadStream *BaseFileManager::openFile(const Common::String &file if (strcmp(filename.c_str(), "") == 0) {
return NULL;
}
- debugC(kWinterMuteDebugFileAccess, "Open file %s", filename.c_str());
+ debugC(kWintermuteDebugFileAccess, "Open file %s", filename.c_str());
Common::SeekableReadStream *file = openFileRaw(filename);
if (file && keepTrackOf) {
@@ -317,7 +317,7 @@ Common::SeekableReadStream *BaseFileManager::openFileRaw(const Common::String &f return ret;
}
- debugC(kWinterMuteDebugFileAccess ,"BFileManager::OpenFileRaw - Failed to open %s", filename.c_str());
+ debugC(kWintermuteDebugFileAccess ,"BFileManager::OpenFileRaw - Failed to open %s", filename.c_str());
return NULL;
}
@@ -328,4 +328,4 @@ BaseFileManager *BaseFileManager::getEngineInstance() { return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h index 23032ca65a..91b1add1c8 100644 --- a/engines/wintermute/base/base_file_manager.h +++ b/engines/wintermute/base/base_file_manager.h @@ -34,7 +34,7 @@ #include "common/fs.h"
#include "common/file.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFileManager {
public:
bool cleanup();
@@ -69,6 +69,6 @@ private: // the detector too, without launching the entire engine:
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp index 5473419f22..1462f1430d 100644 --- a/engines/wintermute/base/base_frame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -39,7 +39,7 @@ #include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseFrame, false)
@@ -757,4 +757,4 @@ const char *BaseFrame::scToString() { return "[frame]";
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_frame.h b/engines/wintermute/base/base_frame.h index b019ebf7b6..b1eae6b659 100644 --- a/engines/wintermute/base/base_frame.h +++ b/engines/wintermute/base/base_frame.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
#include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSound;
class BaseSubFrame;
class BaseObject;
@@ -68,6 +68,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index b92da4c11b..568e6dc6fd 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -72,7 +72,7 @@ #include "common/system.h"
#include "common/file.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -307,7 +307,7 @@ BaseGame::~BaseGame() { _stringTable = NULL;
DEBUG_DebugDisable();
- debugC(kWinterMuteDebugLog, "--- shutting down normally ---\n");
+ debugC(kWintermuteDebugLog, "--- shutting down normally ---\n");
}
@@ -538,7 +538,7 @@ void BaseGame::LOG(bool res, const char *fmt, ...) { _engineLogCallback(buff, res, _engineLogCallbackData);
}
- debugCN(kWinterMuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
+ debugCN(kWintermuteDebugLog, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
//fprintf((FILE *)_debugLogFile, "%02d:%02d:%02d: %s\n", hours, mins, secs, buff);
//fflush((FILE *)_debugLogFile);
@@ -4490,4 +4490,4 @@ AnsiString BaseGame::getDeviceType() const { return "computer";
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index 8a587da3e3..43efad1482 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -36,7 +36,7 @@ #include "engines/wintermute/math/rect32.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
typedef void (*ENGINE_LOG_CALLBACK)(char *text, bool result, void *data);
@@ -357,6 +357,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp index 01b5cea36d..70d92784a5 100644 --- a/engines/wintermute/base/base_keyboard_state.cpp +++ b/engines/wintermute/base/base_keyboard_state.cpp @@ -32,7 +32,7 @@ #include "common/system.h"
#include "common/keyboard.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseKeyboardState, false)
@@ -309,4 +309,4 @@ Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) { }
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_keyboard_state.h b/engines/wintermute/base/base_keyboard_state.h index 8c4b1afb59..382dd9fbce 100644 --- a/engines/wintermute/base/base_keyboard_state.h +++ b/engines/wintermute/base/base_keyboard_state.h @@ -35,7 +35,7 @@ #include "common/keyboard.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseKeyboardState : public BaseScriptable {
public:
@@ -70,6 +70,6 @@ private: Common::KeyCode vKeyToKeyCode(uint32 vkey); //TODO, reimplement using ScummVM-backend
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_named_object.cpp b/engines/wintermute/base/base_named_object.cpp index 0873f090d0..d95dd3e25b 100644 --- a/engines/wintermute/base/base_named_object.cpp +++ b/engines/wintermute/base/base_named_object.cpp @@ -28,7 +28,7 @@ #include "engines/wintermute/base/base_named_object.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseNamedObject::BaseNamedObject(BaseGame *inGame) : BaseClass(inGame) {
@@ -68,4 +68,4 @@ void BaseNamedObject::setName(const char *name) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_named_object.h b/engines/wintermute/base/base_named_object.h index 32e4d561d7..cd856bb008 100644 --- a/engines/wintermute/base/base_named_object.h +++ b/engines/wintermute/base/base_named_object.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseNamedObject : public BaseClass {
char *_name;
@@ -46,6 +46,6 @@ public: void setName(const char *name);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp index 7d186c7f0a..ff8fcd0bf2 100644 --- a/engines/wintermute/base/base_object.cpp +++ b/engines/wintermute/base/base_object.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/base/base_sprite.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseObject, false)
@@ -1243,4 +1243,4 @@ bool BaseObject::afterMove() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_object.h b/engines/wintermute/base/base_object.h index c1e3172a77..34d9ca89ca 100644 --- a/engines/wintermute/base/base_object.h +++ b/engines/wintermute/base/base_object.h @@ -34,7 +34,7 @@ #include "engines/wintermute/persistent.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSprite;
class BaseSound;
@@ -142,6 +142,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp index 75268f6483..bbbb5d69ba 100644 --- a/engines/wintermute/base/base_parser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -35,7 +35,7 @@ #define WHITESPACE " \t\n\r"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -464,4 +464,4 @@ int BaseParser::scanStr(const char *in, const char *format, ...) { return num;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_parser.h b/engines/wintermute/base/base_parser.h index 34266bd5bd..3d63668059 100644 --- a/engines/wintermute/base/base_parser.h +++ b/engines/wintermute/base/base_parser.h @@ -54,7 +54,7 @@ #include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseParser {
public:
@@ -83,6 +83,6 @@ private: char *_whiteSpace;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_persistence_manager.cpp b/engines/wintermute/base/base_persistence_manager.cpp index e6ed5cb7e0..1beaeecdd7 100644 --- a/engines/wintermute/base/base_persistence_manager.cpp +++ b/engines/wintermute/base/base_persistence_manager.cpp @@ -43,7 +43,7 @@ #include "common/system.h"
#include "common/savefile.h"
-namespace WinterMute {
+namespace Wintermute {
#define SAVE_BUFFER_INIT_SIZE 100000
#define SAVE_BUFFER_GROW_BY 50000
@@ -134,7 +134,7 @@ Common::String BasePersistenceManager::getFilenameForSlot(int slot) const { void BasePersistenceManager::getSaveStateDesc(int slot, SaveStateDescriptor &desc) {
Common::String filename = getFilenameForSlot(slot);
- debugC(kWinterMuteDebugSaveGame, "Trying to list savegame %s in slot %d", filename.c_str(), slot);
+ debugC(kWintermuteDebugSaveGame, "Trying to list savegame %s in slot %d", filename.c_str(), slot);
if (DID_FAIL(readHeader(filename))) {
warning("getSavedDesc(%d) - Failed for %s", slot, filename.c_str());
return;
@@ -331,7 +331,7 @@ bool BasePersistenceManager::initLoad(const Common::String &filename) { _saving = false;
if (_savedName == "" || scumm_stricmp(_savedName.c_str(), _gameRef->getName()) != 0) {
- debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game name doesn't match current game");
+ debugC(kWintermuteDebugSaveGame, "ERROR: Saved game name doesn't match current game");
cleanup();
return STATUS_FAILED;
}
@@ -342,8 +342,8 @@ bool BasePersistenceManager::initLoad(const Common::String &filename) { (_savedVerMajor == DCGF_VER_MAJOR && _savedVerMinor == DCGF_VER_MINOR && _savedVerBuild > DCGF_VER_BUILD)
) {
- debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game version is newer than current game");
- debugC(kWinterMuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
+ debugC(kWintermuteDebugSaveGame, "ERROR: Saved game version is newer than current game");
+ debugC(kWintermuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
cleanup();
return STATUS_FAILED;
}
@@ -353,8 +353,8 @@ bool BasePersistenceManager::initLoad(const Common::String &filename) { (_savedVerMajor == SAVEGAME_VER_MAJOR && _savedVerMinor < SAVEGAME_VER_MINOR) ||
(_savedVerMajor == SAVEGAME_VER_MAJOR && _savedVerMinor == SAVEGAME_VER_MINOR && _savedVerBuild < SAVEGAME_VER_BUILD)
) {
- debugC(kWinterMuteDebugSaveGame, "ERROR: Saved game is too old and cannot be used by this version of game engine");
- debugC(kWinterMuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
+ debugC(kWintermuteDebugSaveGame, "ERROR: Saved game is too old and cannot be used by this version of game engine");
+ debugC(kWintermuteDebugSaveGame, "ERROR: Expected %d.%d.%d got %d.%d.%d", DCGF_VER_MAJOR, DCGF_VER_MINOR, DCGF_VER_BUILD, _savedVerMajor, _savedVerMinor, _savedVerBuild);
cleanup();
return STATUS_FAILED;
@@ -371,7 +371,7 @@ bool BasePersistenceManager::saveFile(const Common::String &filename) { byte *buffer = ((Common::MemoryWriteStreamDynamic *)_saveStream)->getData();
uint32 bufferSize = ((Common::MemoryWriteStreamDynamic *)_saveStream)->size();
- Common::SaveFileManager *saveMan = ((WinterMuteEngine *)g_engine)->getSaveFileMan();
+ Common::SaveFileManager *saveMan = ((WintermuteEngine *)g_engine)->getSaveFileMan();
Common::OutSaveFile *file = saveMan->openForSaving(filename);
file->write(prefixBuffer, prefixSize);
file->write(buffer, bufferSize);
@@ -792,7 +792,7 @@ bool BasePersistenceManager::transfer(const char *name, void *val) { if (_saving) {
SystemClassRegistry::getInstance()->getPointerID(*(void **)val, &classID, &instanceID);
if (*(void **)val != NULL && (classID == -1 || instanceID == -1)) {
- debugC(kWinterMuteDebugSaveGame, "Warning: invalid instance '%s'", name);
+ debugC(kWintermuteDebugSaveGame, "Warning: invalid instance '%s'", name);
}
_saveStream->writeUint32LE(classID);
@@ -825,4 +825,4 @@ bool BasePersistenceManager::checkVersion(byte verMajor, byte verMinor, byte ver return true;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_persistence_manager.h b/engines/wintermute/base/base_persistence_manager.h index 87892b42f3..fea8f231d1 100644 --- a/engines/wintermute/base/base_persistence_manager.h +++ b/engines/wintermute/base/base_persistence_manager.h @@ -38,7 +38,7 @@ #include "common/system.h"
#include "common/rect.h"
-namespace WinterMute {
+namespace Wintermute {
class Vector2;
class BaseGame;
@@ -113,6 +113,6 @@ private: BaseGame *_gameRef;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_point.cpp b/engines/wintermute/base/base_point.cpp index 99e8c609df..73e7e4690a 100644 --- a/engines/wintermute/base/base_point.cpp +++ b/engines/wintermute/base/base_point.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_point.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BasePoint, false)
@@ -60,4 +60,4 @@ bool BasePoint::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_point.h b/engines/wintermute/base/base_point.h index 35d310b8d9..68a37c0110 100644 --- a/engines/wintermute/base/base_point.h +++ b/engines/wintermute/base/base_point.h @@ -32,7 +32,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BasePoint: public BaseClass {
public:
@@ -45,6 +45,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_quick_msg.cpp b/engines/wintermute/base/base_quick_msg.cpp index e9f3e430af..dfe25b474b 100644 --- a/engines/wintermute/base/base_quick_msg.cpp +++ b/engines/wintermute/base/base_quick_msg.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_quick_msg.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseQuickMsg::BaseQuickMsg(BaseGame *inGame, const char *text) : BaseClass(inGame) {
@@ -54,4 +54,4 @@ char *BaseQuickMsg::getText() { return _text;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_quick_msg.h b/engines/wintermute/base/base_quick_msg.h index f2f9144bc0..bef81827b0 100644 --- a/engines/wintermute/base/base_quick_msg.h +++ b/engines/wintermute/base/base_quick_msg.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseQuickMsg : public BaseClass {
public:
@@ -43,6 +43,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp index 82dc359eb0..a781c7eeb7 100644 --- a/engines/wintermute/base/base_region.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/platform_osystem.h"
#include <limits.h>
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseRegion, false)
@@ -536,4 +536,4 @@ bool BaseRegion::mimic(BaseRegion *region, float scale, int x, int y) { return createRegion() ? STATUS_OK : STATUS_FAILED;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_region.h b/engines/wintermute/base/base_region.h index 7770d345f7..f456eb07fc 100644 --- a/engines/wintermute/base/base_region.h +++ b/engines/wintermute/base/base_region.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_point.h"
#include "engines/wintermute/base/base_object.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseRegion : public BaseObject {
public:
@@ -64,6 +64,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_save_thumb_helper.cpp b/engines/wintermute/base/base_save_thumb_helper.cpp index 0d580e8db3..8cd15ccf1d 100644 --- a/engines/wintermute/base/base_save_thumb_helper.cpp +++ b/engines/wintermute/base/base_save_thumb_helper.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/gfx/base_image.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseSaveThumbHelper::BaseSaveThumbHelper(BaseGame *inGame) : BaseClass(inGame) {
@@ -77,4 +77,4 @@ bool BaseSaveThumbHelper::storeThumbnail(bool doFlip) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_save_thumb_helper.h b/engines/wintermute/base/base_save_thumb_helper.h index d0d0757fbf..4131cf89d4 100644 --- a/engines/wintermute/base/base_save_thumb_helper.h +++ b/engines/wintermute/base/base_save_thumb_helper.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseImage;
@@ -46,6 +46,6 @@ private: BaseImage *_richThumbnail;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp index b40647dc7b..d57638a4a8 100644 --- a/engines/wintermute/base/base_script_holder.cpp +++ b/engines/wintermute/base/base_script_holder.cpp @@ -34,7 +34,7 @@ #include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseScriptHolder, false)
@@ -501,4 +501,4 @@ bool BaseScriptHolder::sendEvent(const char *eventName) { return DID_SUCCEED(applyEvent(eventName));
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_script_holder.h b/engines/wintermute/base/base_script_holder.h index 4162936ded..4f3d5f4ef9 100644 --- a/engines/wintermute/base/base_script_holder.h +++ b/engines/wintermute/base/base_script_holder.h @@ -33,7 +33,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseScriptHolder : public BaseScriptable {
public:
@@ -71,6 +71,6 @@ public: virtual bool sendEvent(const char *eventName);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_scriptable.cpp b/engines/wintermute/base/base_scriptable.cpp index 11092427be..6e5b30f7b6 100644 --- a/engines/wintermute/base/base_scriptable.cpp +++ b/engines/wintermute/base/base_scriptable.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseScriptable, false)
@@ -188,4 +188,4 @@ ScScript *BaseScriptable::invokeMethodThread(const char *methodName) { return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_scriptable.h b/engines/wintermute/base/base_scriptable.h index 6227b84649..2501f34561 100644 --- a/engines/wintermute/base/base_scriptable.h +++ b/engines/wintermute/base/base_scriptable.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_named_object.h"
#include "engines/wintermute/persistent.h"
-namespace WinterMute {
+namespace Wintermute {
class ScValue;
class ScStack;
@@ -78,6 +78,6 @@ BaseScriptable *makeSXObject(BaseGame *inGame, ScStack *stack); BaseScriptable *makeSXStore(BaseGame *inGame);
BaseScriptable *makeSXString(BaseGame *inGame, ScStack *stack);
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp index 6c66b808b7..6fe5be9e11 100644 --- a/engines/wintermute/base/base_sprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -41,7 +41,7 @@ #include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseSprite, false)
@@ -812,4 +812,4 @@ bool BaseSprite::killAllSounds() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_sprite.h b/engines/wintermute/base/base_sprite.h index 952bff0017..a02e69c63f 100644 --- a/engines/wintermute/base/base_sprite.h +++ b/engines/wintermute/base/base_sprite.h @@ -33,7 +33,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/base/base_script_holder.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFrame;
class BaseSurface;
class BaseObject;
@@ -85,6 +85,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_string_table.cpp b/engines/wintermute/base/base_string_table.cpp index 2e8774020d..3b5e5e3774 100644 --- a/engines/wintermute/base/base_string_table.cpp +++ b/engines/wintermute/base/base_string_table.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_string_table.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseStringTable::BaseStringTable(BaseGame *inGame) : BaseClass(inGame) {
@@ -252,4 +252,4 @@ bool BaseStringTable::loadFile(const char *filename, bool clearOld) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_string_table.h b/engines/wintermute/base/base_string_table.h index 1bc9047f7f..c8df25810e 100644 --- a/engines/wintermute/base/base_string_table.h +++ b/engines/wintermute/base/base_string_table.h @@ -33,7 +33,7 @@ #include "common/hashmap.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseStringTable : public BaseClass {
public:
@@ -50,6 +50,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_sub_frame.cpp b/engines/wintermute/base/base_sub_frame.cpp index 7f527392dc..3ddfd1bb14 100644 --- a/engines/wintermute/base/base_sub_frame.cpp +++ b/engines/wintermute/base/base_sub_frame.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseSubFrame, false)
@@ -652,4 +652,4 @@ bool BaseSubFrame::setSurfaceSimple() { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_sub_frame.h b/engines/wintermute/base/base_sub_frame.h index d8027d3ce9..935fb667d4 100644 --- a/engines/wintermute/base/base_sub_frame.h +++ b/engines/wintermute/base/base_sub_frame.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseObject;
class BaseSurface;
class BaseSubFrame : public BaseScriptable {
@@ -87,6 +87,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp index e3c3692892..0ff325be7d 100644 --- a/engines/wintermute/base/base_surface_storage.cpp +++ b/engines/wintermute/base/base_surface_storage.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//IMPLEMENT_PERSISTENT(BaseSurfaceStorage, true);
@@ -204,4 +204,4 @@ int BaseSurfaceStorage::surfaceSortCB(const void *arg1, const void *arg2) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_surface_storage.h b/engines/wintermute/base/base_surface_storage.h index c09b0a30ab..f1757b3a32 100644 --- a/engines/wintermute/base/base_surface_storage.h +++ b/engines/wintermute/base/base_surface_storage.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
#include "common/array.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurface;
class BaseSurfaceStorage : public BaseClass {
public:
@@ -52,6 +52,6 @@ public: Common::Array<BaseSurface *> _surfaces;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp index 63a13309fb..d71bce1084 100644 --- a/engines/wintermute/base/base_transition_manager.cpp +++ b/engines/wintermute/base/base_transition_manager.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/base_transition_manager.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseTransitionMgr::BaseTransitionMgr(BaseGame *inGame) : BaseClass(inGame) {
@@ -133,4 +133,4 @@ bool BaseTransitionMgr::update() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_transition_manager.h b/engines/wintermute/base/base_transition_manager.h index 104f327fb8..412361a543 100644 --- a/engines/wintermute/base/base_transition_manager.h +++ b/engines/wintermute/base/base_transition_manager.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseTransitionMgr : public BaseClass {
public:
@@ -49,6 +49,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/base_viewport.cpp b/engines/wintermute/base/base_viewport.cpp index a6c7eea96e..af36a4fdd7 100644 --- a/engines/wintermute/base/base_viewport.cpp +++ b/engines/wintermute/base/base_viewport.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/base/base_viewport.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseViewport, false)
@@ -95,4 +95,4 @@ int BaseViewport::getHeight() { return _rect.bottom - _rect.top;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/base_viewport.h b/engines/wintermute/base/base_viewport.h index 33e9448082..1080c1d806 100644 --- a/engines/wintermute/base/base_viewport.h +++ b/engines/wintermute/base/base_viewport.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseObject;
class BaseViewport : public BaseClass {
public:
@@ -50,6 +50,6 @@ private: Rect32 _rect;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp index 93533b4057..2f7450a999 100644 --- a/engines/wintermute/base/file/base_disk_file.cpp +++ b/engines/wintermute/base/file/base_disk_file.cpp @@ -37,7 +37,7 @@ #include "common/tokenizer.h"
#include "common/config-manager.h"
-namespace WinterMute {
+namespace Wintermute {
void correctSlashes(char *fileName) {
for (size_t i = 0; i < strlen(fileName); i++) {
@@ -196,4 +196,4 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) { return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_disk_file.h b/engines/wintermute/base/file/base_disk_file.h index 99a9e8b9a3..8be06199de 100644 --- a/engines/wintermute/base/file/base_disk_file.h +++ b/engines/wintermute/base/file/base_disk_file.h @@ -31,11 +31,11 @@ #include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
Common::SeekableReadStream *openDiskFile(const Common::String &filename);
bool diskFileExists(const Common::String &filename);
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_file.cpp b/engines/wintermute/base/file/base_file.cpp index 185a21ad57..f2a347ee0f 100644 --- a/engines/wintermute/base/file/base_file.cpp +++ b/engines/wintermute/base/file/base_file.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/base/file/base_file.h"
#include "common/memstream.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -65,4 +65,4 @@ Common::SeekableReadStream *BaseFile::getMemStream() { }
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_file.h b/engines/wintermute/base/file/base_file.h index 0c1ab2a045..f9947fe64f 100644 --- a/engines/wintermute/base/file/base_file.h +++ b/engines/wintermute/base/file/base_file.h @@ -38,7 +38,7 @@ namespace Common { class SeekableReadStream;
}
-namespace WinterMute {
+namespace Wintermute {
class BaseFile {
protected:
@@ -62,6 +62,6 @@ public: virtual Common::SeekableReadStream *getMemStream();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp index a08d55db43..82ddf7c90e 100644 --- a/engines/wintermute/base/file/base_file_entry.cpp +++ b/engines/wintermute/base/file/base_file_entry.cpp @@ -32,7 +32,7 @@ #include "common/substream.h"
#include "common/zlib.h"
-namespace WinterMute {
+namespace Wintermute {
Common::SeekableReadStream *BaseFileEntry::createReadStream() const {
Common::SeekableReadStream *file = _package->getFilePointer();
@@ -70,4 +70,4 @@ BaseFileEntry::~BaseFileEntry() { _package = NULL; // ref only
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_file_entry.h b/engines/wintermute/base/file/base_file_entry.h index b94a6cd9fc..7e71a486ef 100644 --- a/engines/wintermute/base/file/base_file_entry.h +++ b/engines/wintermute/base/file/base_file_entry.h @@ -33,7 +33,7 @@ #include "common/str.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class BasePackage;
@@ -55,6 +55,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp index ab74810d1d..a9fb7f9a68 100644 --- a/engines/wintermute/base/file/base_package.cpp +++ b/engines/wintermute/base/file/base_package.cpp @@ -34,7 +34,7 @@ #include "common/stream.h"
#include "common/debug.h"
-namespace WinterMute {
+namespace Wintermute {
BasePackage::BasePackage() {
_name = "";
@@ -123,13 +123,13 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool TPackageHeader hdr;
hdr.readFromStream(stream);
if (hdr._magic1 != PACKAGE_MAGIC_1 || hdr._magic2 != PACKAGE_MAGIC_2 || hdr._packageVersion > PACKAGE_VERSION) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, " Invalid header in package file '%s'. Ignoring.", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, " Invalid header in package file '%s'. Ignoring.", filename.c_str());
delete stream;
return;
}
if (hdr._packageVersion != PACKAGE_VERSION) {
- debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, " Warning: package file '%s' is outdated.", filename.c_str());
+ debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, " Warning: package file '%s' is outdated.", filename.c_str());
}
_priority = hdr._priority;
// new in v2
@@ -181,7 +181,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool ((byte *)name)[k] ^= 'D';
}
}
- debugC(kWinterMuteDebugFileAccess, "Package contains %s", name);
+ debugC(kWintermuteDebugFileAccess, "Package contains %s", name);
Common::String upcName = name;
upcName.toUppercase();
@@ -222,7 +222,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool }
}
}
- debugC(kWinterMuteDebugFileAccess, " Registered %d files in %d package(s)", _files.size(), _packages.size());
+ debugC(kWintermuteDebugFileAccess, " Registered %d files in %d package(s)", _files.size(), _packages.size());
delete stream;
}
@@ -273,4 +273,4 @@ Common::SeekableReadStream *PackageSet::createReadStreamForMember(const Common:: return NULL;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h index a562229f65..676675b041 100644 --- a/engines/wintermute/base/file/base_package.h +++ b/engines/wintermute/base/file/base_package.h @@ -33,7 +33,7 @@ #include "common/stream.h"
#include "common/fs.h"
-namespace WinterMute {
+namespace Wintermute {
class BasePackage {
public:
Common::SeekableReadStream *getFilePointer();
@@ -85,6 +85,6 @@ private: Common::HashMap<Common::String, Common::ArchiveMemberPtr>::iterator _filesIter;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_resources.cpp b/engines/wintermute/base/file/base_resources.cpp index aac5436071..a8bda164dc 100644 --- a/engines/wintermute/base/file/base_resources.cpp +++ b/engines/wintermute/base/file/base_resources.cpp @@ -30,7 +30,7 @@ #include "common/str.h"
#include "common/memstream.h"
-namespace WinterMute {
+namespace Wintermute {
unsigned char invalid[] = {
0x42, 0x4d, 0x36, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x04, 0x00, 0x00, 0x28, 0x00,
@@ -2827,4 +2827,4 @@ bool BaseResources::hasFile(const Common::String &filename) { return false;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_resources.h b/engines/wintermute/base/file/base_resources.h index 2ccab6996f..596ac64dd7 100644 --- a/engines/wintermute/base/file/base_resources.h +++ b/engines/wintermute/base/file/base_resources.h @@ -32,7 +32,7 @@ #include "common/stream.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseResources {
public:
@@ -40,6 +40,6 @@ public: static bool hasFile(const Common::String &filename);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp index 1f7288a6ff..515d8870d7 100644 --- a/engines/wintermute/base/file/base_save_thumb_file.cpp +++ b/engines/wintermute/base/file/base_save_thumb_file.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/file/base_save_thumb_file.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -151,4 +151,4 @@ bool BaseSaveThumbFile::seek(uint32 pos, int whence) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/file/base_save_thumb_file.h b/engines/wintermute/base/file/base_save_thumb_file.h index d95958d95f..e68dc06904 100644 --- a/engines/wintermute/base/file/base_save_thumb_file.h +++ b/engines/wintermute/base/file/base_save_thumb_file.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/file/base_file.h"
-namespace WinterMute {
+namespace Wintermute {
//TODO: Get rid of this
class BaseSaveThumbFile : public BaseFile {
@@ -47,6 +47,6 @@ private: byte *_data;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h index ccebc5909c..42c0b75e55 100644 --- a/engines/wintermute/base/file/dcpackage.h +++ b/engines/wintermute/base/file/dcpackage.h @@ -37,7 +37,7 @@ #include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
struct TPackageHeader {
uint32 _magic1;
@@ -75,6 +75,6 @@ v2: uint32 TimeDate1 */
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // _DCPACKAGE_H_
diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp index fa9242366e..198b1ae308 100644 --- a/engines/wintermute/base/font/base_font.cpp +++ b/engines/wintermute/base/font/base_font.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_parser.h"
#include "engines/wintermute/base/base_file_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -204,4 +204,4 @@ bool BaseFont::isTrueType(BaseGame *gameRef, const Common::String &filename) { return ret;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font.h b/engines/wintermute/base/font/base_font.h index f1dc962565..e4413e3410 100644 --- a/engines/wintermute/base/font/base_font.h +++ b/engines/wintermute/base/font/base_font.h @@ -33,7 +33,7 @@ #define NUM_CHARACTERS 256
-namespace WinterMute {
+namespace Wintermute {
class BaseFont: public BaseObject {
public:
@@ -56,6 +56,6 @@ private: static bool isTrueType(BaseGame *game, const Common::String &filename);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 6585d7cb0a..0913ac9b53 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -38,7 +38,7 @@ #include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -586,4 +586,4 @@ int BaseFontBitmap::getLetterHeight() { return _tileHeight;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font_bitmap.h b/engines/wintermute/base/font/base_font_bitmap.h index fb992d2e9a..0b873855bb 100644 --- a/engines/wintermute/base/font/base_font_bitmap.h +++ b/engines/wintermute/base/font/base_font_bitmap.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/font/base_font.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSubFrame;
class BaseFontBitmap : public BaseFont {
public:
@@ -66,6 +66,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp index 0c34a8822a..bc7ab6f22c 100644 --- a/engines/wintermute/base/font/base_font_storage.cpp +++ b/engines/wintermute/base/font/base_font_storage.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -139,4 +139,4 @@ bool BaseFontStorage::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font_storage.h b/engines/wintermute/base/font/base_font_storage.h index 3a39617c32..498096a5a8 100644 --- a/engines/wintermute/base/font/base_font_storage.h +++ b/engines/wintermute/base/font/base_font_storage.h @@ -34,7 +34,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFont;
@@ -50,6 +50,6 @@ public: bool initLoop();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 4fa5ac08ce..ced279dcc8 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -43,7 +43,7 @@ #include "graphics/fontman.h"
#include <limits.h>
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseFontTT, false)
@@ -198,7 +198,7 @@ void BaseFontTT::drawText(byte *text, int x, int y, int width, TTextAlign align, // not found, create one
if (!surface) {
- debugC(kWinterMuteDebugFont, "Draw text: %s", text);
+ debugC(kWintermuteDebugFont, "Draw text: %s", text);
surface = renderTextToTexture(textStr, width, align, maxHeight, textOffset);
if (surface) {
// write surface to cache
@@ -264,7 +264,7 @@ BaseSurface *BaseFontTT::renderTextToTexture(const WideString &text, int width, alignment = Graphics::kTextAlignRight;
}
- debugC(kWinterMuteDebugFont, "%s %d %d %d %d", text.c_str(), RGBCOLGetR(_layers[0]->_color), RGBCOLGetG(_layers[0]->_color), RGBCOLGetB(_layers[0]->_color), RGBCOLGetA(_layers[0]->_color));
+ debugC(kWintermuteDebugFont, "%s %d %d %d %d", text.c_str(), RGBCOLGetR(_layers[0]->_color), RGBCOLGetG(_layers[0]->_color), RGBCOLGetB(_layers[0]->_color), RGBCOLGetA(_layers[0]->_color));
// void drawString(Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;
Graphics::Surface *surface = new Graphics::Surface();
if (_deletableFont) { // We actually have a TTF
@@ -602,4 +602,4 @@ void BaseFontTT::measureText(const WideString &text, int maxWidth, int maxHeight }*/
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/font/base_font_truetype.h b/engines/wintermute/base/font/base_font_truetype.h index a893e70ec0..fc4de30fc5 100644 --- a/engines/wintermute/base/font/base_font_truetype.h +++ b/engines/wintermute/base/font/base_font_truetype.h @@ -38,7 +38,7 @@ #define NUM_CACHED_TEXTS 30
-namespace WinterMute {
+namespace Wintermute {
class BaseFontTT : public BaseFont {
private:
@@ -147,6 +147,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index c1b6636237..ec52e26c00 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -38,7 +38,7 @@ #include "common/stream.h"
#include "common/system.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseImage::BaseImage() {
@@ -69,7 +69,7 @@ bool BaseImage::loadFile(const Common::String &filename) { } else if (_filename.hasSuffix(".bmp")) {
_decoder = new Graphics::BitmapDecoder();
} else if (_filename.hasSuffix(".tga")) {
- _decoder = new WinterMute::TGA();
+ _decoder = new Wintermute::TGA();
} else if (_filename.hasSuffix(".jpg")) {
_decoder = new Graphics::JPEGDecoder();
} else {
@@ -228,4 +228,4 @@ bool BaseImage::copyFrom(BaseImage *origImage, int newWidth, int newHeight) { return true;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h index 76a389977d..7bf901fe40 100644 --- a/engines/wintermute/base/gfx/base_image.h +++ b/engines/wintermute/base/gfx/base_image.h @@ -36,7 +36,7 @@ #include "common/str.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurface;
class BaseFileManager;
class BaseImage {
@@ -67,6 +67,6 @@ private: BaseFileManager *_fileManager;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index 5d81c44c25..47a5462452 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -34,7 +34,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseRenderer::BaseRenderer(BaseGame *inGame) : BaseClass(inGame) {
@@ -373,4 +373,4 @@ bool BaseRenderer::displayIndicator() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h index 49b5e187eb..aa8812254d 100644 --- a/engines/wintermute/base/gfx/base_renderer.h +++ b/engines/wintermute/base/gfx/base_renderer.h @@ -34,7 +34,7 @@ #include "common/rect.h"
#include "common/array.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseImage;
class BaseActiveRect;
@@ -215,6 +215,6 @@ private: BaseRenderer *makeOSystemRenderer(BaseGame *inGame); // Implemented in BRenderSDL.cpp
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp index 28ac4e6973..cbd665591a 100644 --- a/engines/wintermute/base/gfx/base_surface.cpp +++ b/engines/wintermute/base/gfx/base_surface.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/gfx/base_surface.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
BaseSurface::BaseSurface(BaseGame *inGame) : BaseClass(inGame) {
@@ -146,4 +146,4 @@ void BaseSurface::setSize(int width, int height) { _height = height;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h index 57a51ce3aa..3be61477ba 100644 --- a/engines/wintermute/base/gfx/base_surface.h +++ b/engines/wintermute/base/gfx/base_surface.h @@ -33,7 +33,7 @@ #include "engines/wintermute/math/rect32.h"
#include "graphics/surface.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurface: public BaseClass {
public:
@@ -94,6 +94,6 @@ protected: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp index ab4e690458..201c881122 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp @@ -38,7 +38,7 @@ #include "common/queue.h"
#include "common/config-manager.h"
-namespace WinterMute {
+namespace Wintermute {
RenderTicket::RenderTicket(BaseSurfaceOSystem *owner, const Graphics::Surface *surf, Common::Rect *srcRect, Common::Rect *dstRect, bool mirrorX, bool mirrorY, bool disableAlpha) : _owner(owner),
_srcRect(*srcRect), _dstRect(*dstRect), _drawNum(0), _isValid(true), _wantsDraw(true), _hasAlpha(!disableAlpha) {
@@ -602,4 +602,4 @@ BaseSurface *BaseRenderOSystem::createSurface() { return new BaseSurfaceOSystem(_gameRef);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h index 070ddf9241..5859fec74e 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h @@ -34,7 +34,7 @@ #include "graphics/surface.h"
#include "common/list.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurfaceOSystem;
class RenderTicket {
Graphics::Surface *_surface;
@@ -125,6 +125,6 @@ private: uint32 _clearColor;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_BRENDERER_SDL_H
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index 400bb1de41..5b0f7c94c3 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -43,7 +43,7 @@ #include "common/stream.h"
#include "common/system.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
BaseSurfaceOSystem::BaseSurfaceOSystem(BaseGame *inGame) : BaseSurface(inGame) {
@@ -426,4 +426,4 @@ bool BaseSurfaceOSystem::putSurface(const Graphics::Surface &surface, bool hasAl return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h index fe1d055026..27f9ad047e 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/gfx/base_surface.h"
#include "common/list.h"
-namespace WinterMute {
+namespace Wintermute {
struct TransparentSurface;
class BaseImage;
class BaseSurfaceOSystem : public BaseSurface {
@@ -94,6 +94,6 @@ private: byte *_alphaMask;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_BSURFACESDL_H
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index ced01b7fd9..d6006528a2 100644 --- a/engines/wintermute/base/particles/part_emitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -40,7 +40,7 @@ #include "common/str.h"
#include "common/math.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(PartEmitter, false)
@@ -1253,4 +1253,4 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h index 438dfff521..dd02cf7f17 100644 --- a/engines/wintermute/base/particles/part_emitter.h +++ b/engines/wintermute/base/particles/part_emitter.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/base/particles/part_force.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseRegion;
class PartParticle;
class PartEmitter : public BaseObject {
@@ -135,6 +135,6 @@ private: BaseArray<char *> _sprites;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/particles/part_force.cpp b/engines/wintermute/base/particles/part_force.cpp index 7b2f117b4f..abbaa2819d 100644 --- a/engines/wintermute/base/particles/part_force.cpp +++ b/engines/wintermute/base/particles/part_force.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/particles/part_force.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
PartForce::PartForce(BaseGame *inGame) : BaseNamedObject(inGame) {
@@ -62,4 +62,4 @@ bool PartForce::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/particles/part_force.h b/engines/wintermute/base/particles/part_force.h index ec79ab7238..6903a919e9 100644 --- a/engines/wintermute/base/particles/part_force.h +++ b/engines/wintermute/base/particles/part_force.h @@ -34,7 +34,7 @@ #include "engines/wintermute/base/base_named_object.h"
#include "engines/wintermute/math/vector2.h"
-namespace WinterMute {
+namespace Wintermute {
class PartForce : public BaseNamedObject {
public:
@@ -52,6 +52,6 @@ public: bool persist(BasePersistenceManager *PersistMgr);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp index 1a449a50a5..9247514ac3 100644 --- a/engines/wintermute/base/particles/part_particle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/platform_osystem.h"
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
PartParticle::PartParticle(BaseGame *inGame) : BaseClass(inGame) {
@@ -266,4 +266,4 @@ bool PartParticle::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/particles/part_particle.h b/engines/wintermute/base/particles/part_particle.h index 44da85a559..3c8fc2c68b 100644 --- a/engines/wintermute/base/particles/part_particle.h +++ b/engines/wintermute/base/particles/part_particle.h @@ -34,7 +34,7 @@ #include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/math/vector2.h"
-namespace WinterMute {
+namespace Wintermute {
class PartEmitter;
class BaseSprite;
@@ -85,6 +85,6 @@ private: int _fadeStartAlpha;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp index fe987c0b2a..06e9fd2565 100644 --- a/engines/wintermute/base/saveload.cpp +++ b/engines/wintermute/base/saveload.cpp @@ -40,7 +40,7 @@ #include "common/savefile.h" #include "common/config-manager.h" -namespace WinterMute { +namespace Wintermute { bool SaveLoad::loadGame(const Common::String &filename, BaseGame *gameRef) { gameRef->LOG(0, "Loading game '%s'...", filename.c_str()); @@ -159,7 +159,7 @@ Common::String SaveLoad::getSaveSlotFilename(int slot) { BasePersistenceManager *pm = new BasePersistenceManager(); Common::String filename = pm->getFilenameForSlot(slot); delete pm; - debugC(kWinterMuteDebugSaveGame, "getSaveSlotFileName(%d) = %s", slot, filename.c_str()); + debugC(kWintermuteDebugSaveGame, "getSaveSlotFileName(%d) = %s", slot, filename.c_str()); return filename; } @@ -194,10 +194,10 @@ bool SaveLoad::isSaveSlotUsed(int slot) { bool SaveLoad::emptySaveSlot(int slot) { Common::String filename = getSaveSlotFilename(slot); BasePersistenceManager *pm = new BasePersistenceManager(); - ((WinterMuteEngine *)g_engine)->getSaveFileMan()->removeSavefile(pm->getFilenameForSlot(slot)); + ((WintermuteEngine *)g_engine)->getSaveFileMan()->removeSavefile(pm->getFilenameForSlot(slot)); delete pm; return true; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/base/saveload.h b/engines/wintermute/base/saveload.h index 59cdceb038..e448cc8814 100644 --- a/engines/wintermute/base/saveload.h +++ b/engines/wintermute/base/saveload.h @@ -31,7 +31,7 @@ #include "common/str.h" -namespace WinterMute { +namespace Wintermute { class BaseGame; class SaveLoad { public: @@ -52,6 +52,6 @@ private: static void afterLoadScript(void *script, void *data); }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/base/scriptables/dcscript.h b/engines/wintermute/base/scriptables/dcscript.h index 9610ebf94c..db63ad2b87 100644 --- a/engines/wintermute/base/scriptables/dcscript.h +++ b/engines/wintermute/base/scriptables/dcscript.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_DCSCRIPT_H
#define WINTERMUTE_DCSCRIPT_H
-namespace WinterMute {
+namespace Wintermute {
#define SCRIPT_MAGIC 0xDEC0ADDE
#define SCRIPT_VERSION 0x0102
@@ -136,6 +136,6 @@ typedef enum { ELEMENT_STRING = 0
} TElementType;
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index fb77225700..6c8a88adb0 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/memstream.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(ScScript, false)
@@ -1464,4 +1464,4 @@ void ScScript::afterLoad() { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h index 9f49fac994..132f1ce6c5 100644 --- a/engines/wintermute/base/scriptables/script.h +++ b/engines/wintermute/base/scriptables/script.h @@ -34,7 +34,7 @@ #include "engines/wintermute/base/scriptables/dcscript.h" // Added by ClassView
#include "engines/wintermute/coll_templ.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseScriptHolder;
class BaseObject;
class ScEngine;
@@ -169,6 +169,6 @@ public: virtual const char *dbgGetFilename();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index a1f246c4bc..8765fb9864 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -37,7 +37,7 @@ #include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/utils/utils.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(ScEngine, true)
@@ -608,4 +608,4 @@ void ScEngine::dumpStats() { }*/
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h index 9aae8be85b..f526353368 100644 --- a/engines/wintermute/base/scriptables/script_engine.h +++ b/engines/wintermute/base/scriptables/script_engine.h @@ -33,7 +33,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/base/base.h"
-namespace WinterMute {
+namespace Wintermute {
#define MAX_CACHED_SCRIPTS 20
class ScScript;
@@ -130,6 +130,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_array.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp index a422d6d8a5..c8d4f64ae9 100644 --- a/engines/wintermute/base/scriptables/script_ext_array.cpp +++ b/engines/wintermute/base/scriptables/script_ext_array.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/system/sys_instance.h"
#include "engines/wintermute/base/scriptables/script_ext_array.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXArray, false)
@@ -249,4 +249,4 @@ bool SXArray::push(ScValue *val) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_array.h b/engines/wintermute/base/scriptables/script_ext_array.h index f2718f4ea2..614f829950 100644 --- a/engines/wintermute/base/scriptables/script_ext_array.h +++ b/engines/wintermute/base/scriptables/script_ext_array.h @@ -31,7 +31,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXArray : public BaseScriptable {
public:
@@ -51,6 +51,6 @@ private: Common::String _strRep;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_date.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp index 72f41c83cc..b5acc7d389 100644 --- a/engines/wintermute/base/scriptables/script_ext_date.cpp +++ b/engines/wintermute/base/scriptables/script_ext_date.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/scriptables/script_ext_date.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXDate, false)
@@ -291,4 +291,4 @@ int SXDate::scCompare(BaseScriptable *Value) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_date.h b/engines/wintermute/base/scriptables/script_ext_date.h index 69fe1f1ae5..521b7a9f8a 100644 --- a/engines/wintermute/base/scriptables/script_ext_date.h +++ b/engines/wintermute/base/scriptables/script_ext_date.h @@ -32,7 +32,7 @@ #include "common/system.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXDate : public BaseScriptable {
public:
@@ -50,6 +50,6 @@ private: Common::String _strRep;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 50d89921e1..53d551119d 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -40,7 +40,7 @@ // Note: This code is completely untested, as I have yet to find a game that uses SXFile.
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXFile, false)
@@ -826,4 +826,4 @@ Common::WriteStream *SXFile::openForAppend(const Common::String &filename, bool error("SXFile::openForAppend - WriteFiles not supported");
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_file.h b/engines/wintermute/base/scriptables/script_ext_file.h index d083f96a4a..389974a48e 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.h +++ b/engines/wintermute/base/scriptables/script_ext_file.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_scriptable.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFile;
@@ -61,6 +61,6 @@ private: Common::WriteStream *openForAppend(const Common::String &filename, bool binary);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_math.cpp b/engines/wintermute/base/scriptables/script_ext_math.cpp index 6b80da6389..906d807275 100644 --- a/engines/wintermute/base/scriptables/script_ext_math.cpp +++ b/engines/wintermute/base/scriptables/script_ext_math.cpp @@ -33,7 +33,7 @@ #include "common/math.h"
#include <cmath>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -292,4 +292,4 @@ bool SXMath::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_math.h b/engines/wintermute/base/scriptables/script_ext_math.h index 393342e5ca..b195c0785d 100644 --- a/engines/wintermute/base/scriptables/script_ext_math.h +++ b/engines/wintermute/base/scriptables/script_ext_math.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXMath : public BaseScriptable {
public:
@@ -48,6 +48,6 @@ private: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index 557d9b9b57..eef1931d8b 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h"
#include "common/file.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXMemBuffer, false)
@@ -526,4 +526,4 @@ int SXMemBuffer::scCompare(BaseScriptable *val) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h index b5428b4bd9..0a16167b58 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.h +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXMemBuffer : public BaseScriptable {
public:
@@ -55,6 +55,6 @@ private: bool checkBounds(ScScript *script, int start, int length);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_object.cpp b/engines/wintermute/base/scriptables/script_ext_object.cpp index ab7296b1ce..40c9b885cd 100644 --- a/engines/wintermute/base/scriptables/script_ext_object.cpp +++ b/engines/wintermute/base/scriptables/script_ext_object.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -64,4 +64,4 @@ bool SXObject::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_object.h b/engines/wintermute/base/scriptables/script_ext_object.h index f7d3a7bc0f..32aa00776e 100644 --- a/engines/wintermute/base/scriptables/script_ext_object.h +++ b/engines/wintermute/base/scriptables/script_ext_object.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_object.h"
-namespace WinterMute {
+namespace Wintermute {
class SXObject : public BaseObject {
public:
@@ -41,6 +41,6 @@ public: virtual ~SXObject();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index adbf16611c..9bcfe28bbf 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -35,7 +35,7 @@ #include "engines/wintermute/utils/string_util.h"
#include "common/tokenizer.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(SXString, false)
@@ -433,4 +433,4 @@ int SXString::scCompare(BaseScriptable *val) { return strcmp(_string, ((SXString *)val)->_string);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_ext_string.h b/engines/wintermute/base/scriptables/script_ext_string.h index 9a3bbfc80b..c2de3860ed 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.h +++ b/engines/wintermute/base/scriptables/script_ext_string.h @@ -32,7 +32,7 @@ #include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
class SXString : public BaseScriptable {
public:
@@ -53,6 +53,6 @@ private: int _capacity;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 9b3a0201ac..7e81cdaf17 100644 --- a/engines/wintermute/base/scriptables/script_stack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/base/base_game.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(ScStack, false)
@@ -229,4 +229,4 @@ bool ScStack::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_stack.h b/engines/wintermute/base/scriptables/script_stack.h index 95839cc680..0e2adae518 100644 --- a/engines/wintermute/base/scriptables/script_stack.h +++ b/engines/wintermute/base/scriptables/script_stack.h @@ -34,7 +34,7 @@ #include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
-namespace WinterMute {
+namespace Wintermute {
class ScValue;
class BaseScriptable;
@@ -61,6 +61,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp index d35f85f9a1..03ca69ac7e 100644 --- a/engines/wintermute/base/scriptables/script_value.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -34,7 +34,7 @@ #include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/base/base_scriptable.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -992,4 +992,4 @@ bool ScValue::setProperty(const char *propName) { return ret;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/scriptables/script_value.h b/engines/wintermute/base/scriptables/script_value.h index c8d04168b3..af31014bac 100644 --- a/engines/wintermute/base/scriptables/script_value.h +++ b/engines/wintermute/base/scriptables/script_value.h @@ -35,7 +35,7 @@ #include "engines/wintermute/base/scriptables/dcscript.h" // Added by ClassView
#include "common/str.h"
-namespace WinterMute {
+namespace Wintermute {
class ScScript;
class BaseScriptable;
@@ -108,6 +108,6 @@ public: bool setProperty(const char *propName);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/sound/base_sound.cpp b/engines/wintermute/base/sound/base_sound.cpp index 7e32552d08..aac68baccd 100644 --- a/engines/wintermute/base/sound/base_sound.cpp +++ b/engines/wintermute/base/sound/base_sound.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/base/sound/base_sound_manager.h"
#include "engines/wintermute/base/sound/base_sound_buffer.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(BaseSound, false)
@@ -289,4 +289,4 @@ bool BaseSound::applyFX(TSFXType type, float param1, float param2, float param3, return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h index cadba77bc8..fcc463ed06 100644 --- a/engines/wintermute/base/sound/base_sound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -34,7 +34,7 @@ #include "engines/wintermute/persistent.h"
#include "audio/mixer.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSoundBuffer;
class BaseSound : public BaseClass {
@@ -82,6 +82,6 @@ private: BaseSoundBuffer *_sound;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index ac329704bc..14bbcd9421 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -41,7 +41,7 @@ #include "common/system.h"
#include "common/substream.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -93,7 +93,7 @@ void BaseSoundBuffer::setStreaming(bool streamed, uint32 numBlocks, uint32 block //////////////////////////////////////////////////////////////////////////
bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceReload) {
- debugC(kWinterMuteDebugAudio, "BSoundBuffer::LoadFromFile(%s,%d)", filename.c_str(), forceReload);
+ debugC(kWintermuteDebugAudio, "BSoundBuffer::LoadFromFile(%s,%d)", filename.c_str(), forceReload);
// Load a file, but avoid having the File-manager handle the disposal of it.
_file = BaseFileManager::getEngineInstance()->openFile(filename, true, false);
@@ -290,4 +290,4 @@ bool BaseSoundBuffer::applyFX(TSFXType type, float param1, float param2, float p return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/sound/base_sound_buffer.h b/engines/wintermute/base/sound/base_sound_buffer.h index 7aec144283..3ec4d4d28b 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.h +++ b/engines/wintermute/base/sound/base_sound_buffer.h @@ -39,7 +39,7 @@ class SeekableAudioStream; class SoundHandle;
}
-namespace WinterMute {
+namespace Wintermute {
class BaseFile;
class BaseSoundBuffer : public BaseClass {
@@ -95,6 +95,6 @@ private: int _volume;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp index 95b7d040ab..2bfe0499f9 100644 --- a/engines/wintermute/base/sound/base_sound_manager.cpp +++ b/engines/wintermute/base/sound/base_sound_manager.cpp @@ -37,7 +37,7 @@ #include "common/config-manager.h"
#include "audio/mixer.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -279,4 +279,4 @@ float BaseSoundMgr::posToPan(int x, int y) { return minPan + relPos * (maxPan - minPan);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/base/sound/base_sound_manager.h b/engines/wintermute/base/sound/base_sound_manager.h index a2b8f2c9e9..a0b9a4bc4b 100644 --- a/engines/wintermute/base/sound/base_sound_manager.h +++ b/engines/wintermute/base/sound/base_sound_manager.h @@ -34,7 +34,7 @@ #include "audio/mixer.h"
#include "common/array.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSoundBuffer;
class BaseSoundMgr : public BaseClass {
public:
@@ -63,6 +63,6 @@ public: void saveSettings();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h index 51a4120c15..96daaf62ee 100644 --- a/engines/wintermute/coll_templ.h +++ b/engines/wintermute/coll_templ.h @@ -32,7 +32,7 @@ #include "common/array.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
// Basically Common::Array with peristence-support.
template<typename TYPE>
@@ -88,6 +88,6 @@ public: }
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // COLL_TEMPL_H
diff --git a/engines/wintermute/dctypes.h b/engines/wintermute/dctypes.h index edca18a6ed..9cad244255 100644 --- a/engines/wintermute/dctypes.h +++ b/engines/wintermute/dctypes.h @@ -34,7 +34,7 @@ #include "common/list.h"
#include "common/array.h"
-namespace WinterMute {
+namespace Wintermute {
//typedef std::string AnsiString;
//typedef std::string Utf8String;
@@ -221,6 +221,6 @@ enum TShadowType { SHADOW_STENCIL = 3
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // DCTYPES_H
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp index b3f210d67a..7e4da68a93 100644 --- a/engines/wintermute/detection.cpp +++ b/engines/wintermute/detection.cpp @@ -33,10 +33,10 @@ #include "engines/wintermute/detection_tables.h" -namespace WinterMute { +namespace Wintermute { /** - * The fallback game descriptor used by the WinterMute engine's fallbackDetector. + * The fallback game descriptor used by the Wintermute engine's fallbackDetector. * Contents of this struct are overwritten by the fallbackDetector. (logic copied partially * from the SCI-engine). */ @@ -51,9 +51,9 @@ static ADGameDescription s_fallbackDesc = { }; static char s_fallbackGameIdBuf[256]; -class WinterMuteMetaEngine : public AdvancedMetaEngine { +class WintermuteMetaEngine : public AdvancedMetaEngine { public: - WinterMuteMetaEngine() : AdvancedMetaEngine(WinterMute::gameDescriptions, sizeof(ADGameDescription), WinterMute::wintermuteGames) { + WintermuteMetaEngine() : AdvancedMetaEngine(Wintermute::gameDescriptions, sizeof(ADGameDescription), Wintermute::wintermuteGames) { _singleid = "wintermute"; } virtual const char *getName() const { @@ -95,7 +95,7 @@ public: if (0 == scumm_stricmp("data.dcp", gameName)) { // You could check the contents of the file now if you need to. - detectedGames.push_back(WinterMute_setting[0]); + detectedGames.push_back(Wintermute_setting[0]); break; } } @@ -115,7 +115,7 @@ public: if (allFiles.contains("data.dcp")) { Common::String name, caption; - if (WinterMuteEngine::getGameInfo(fslist, name, caption)) { + if (WintermuteEngine::getGameInfo(fslist, name, caption)) { for (uint32 i = 0; i < name.size(); i++) { // Replace spaces (and other non-alphanumerics) with underscores if (!Common::isAlnum(name[(int32)i])) { @@ -144,7 +144,7 @@ public: assert(syst); assert(engine); - *engine = new WinterMute::WinterMuteEngine(syst, desc); + *engine = new Wintermute::WintermuteEngine(syst, desc); return true; } @@ -169,7 +169,7 @@ public: SaveStateList listSaves(const char *target) const { SaveStateList saves; - WinterMute::BasePersistenceManager pm(target, true); + Wintermute::BasePersistenceManager pm(target, true); for (int i = 0; i < getMaximumSaveSlot(); i++) { if (pm.getSaveExists(i)) { SaveStateDescriptor desc; @@ -185,12 +185,12 @@ public: } void removeSaveState(const char *target, int slot) const { - WinterMute::BasePersistenceManager pm(target, true); + Wintermute::BasePersistenceManager pm(target, true); pm.deleteSaveSlot(slot); } virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const { - WinterMute::BasePersistenceManager pm(target, true); + Wintermute::BasePersistenceManager pm(target, true); SaveStateDescriptor retVal; retVal.setDescription("Invalid savegame"); pm.getSaveStateDesc(slot, retVal); @@ -198,10 +198,10 @@ public: } }; -} // end of namespace WinterMute +} // end of namespace Wintermute #if PLUGIN_ENABLED_DYNAMIC(WINTERMUTE) -REGISTER_PLUGIN_DYNAMIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, WinterMute::WinterMuteMetaEngine); +REGISTER_PLUGIN_DYNAMIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, Wintermute::WintermuteMetaEngine); #else -REGISTER_PLUGIN_STATIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, WinterMute::WinterMuteMetaEngine); +REGISTER_PLUGIN_STATIC(WINTERMUTE, PLUGIN_TYPE_ENGINE, Wintermute::WintermuteMetaEngine); #endif diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h index 272daea2d9..2e7def0d77 100644 --- a/engines/wintermute/detection_tables.h +++ b/engines/wintermute/detection_tables.h @@ -20,7 +20,7 @@ * */ -namespace WinterMute { +namespace Wintermute { static const PlainGameDescriptor wintermuteGames[] = { {"5ld", "Five Lethal Demons"}, @@ -230,4 +230,4 @@ static const ADGameDescription gameDescriptions[] = { AD_TABLE_END_MARKER }; -} // End of namespace WinterMute +} // End of namespace Wintermute diff --git a/engines/wintermute/graphics/tga.cpp b/engines/wintermute/graphics/tga.cpp index 1bf4383ccf..8c3868c023 100644 --- a/engines/wintermute/graphics/tga.cpp +++ b/engines/wintermute/graphics/tga.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/graphics/tga.h" -namespace WinterMute { +namespace Wintermute { TGA::TGA() { diff --git a/engines/wintermute/graphics/tga.h b/engines/wintermute/graphics/tga.h index b3b46fb529..5e118f2338 100644 --- a/engines/wintermute/graphics/tga.h +++ b/engines/wintermute/graphics/tga.h @@ -33,7 +33,7 @@ namespace Common { class SeekableReadStream; } -namespace WinterMute { +namespace Wintermute { /** TarGa image. */ class TGA : public Graphics::ImageDecoder { diff --git a/engines/wintermute/graphics/transparent_surface.cpp b/engines/wintermute/graphics/transparent_surface.cpp index 982399976b..47e3591d4d 100644 --- a/engines/wintermute/graphics/transparent_surface.cpp +++ b/engines/wintermute/graphics/transparent_surface.cpp @@ -27,7 +27,7 @@ #include "graphics/primitives.h" #include "engines/wintermute/graphics/transparent_surface.h" -namespace WinterMute { +namespace Wintermute { byte *TransparentSurface::_lookup = NULL; diff --git a/engines/wintermute/graphics/transparent_surface.h b/engines/wintermute/graphics/transparent_surface.h index d9fe00a6d9..8b00dccbd9 100644 --- a/engines/wintermute/graphics/transparent_surface.h +++ b/engines/wintermute/graphics/transparent_surface.h @@ -37,7 +37,7 @@ #define BS_RGB(R,G,B) (0xFF000000 | ((R) << 16) | ((G) << 8) | (B)) #define BS_ARGB(A,R,G,B) (((A) << 24) | ((R) << 16) | ((G) << 8) | (B)) -namespace WinterMute { +namespace Wintermute { /** * A transparent graphics surface, which implements alpha blitting. diff --git a/engines/wintermute/math/math_util.cpp b/engines/wintermute/math/math_util.cpp index ef5b676662..4a308a914e 100644 --- a/engines/wintermute/math/math_util.cpp +++ b/engines/wintermute/math/math_util.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/math/math_util.h"
#include <cmath>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
float MathUtil::round(float val) {
@@ -49,4 +49,4 @@ float MathUtil::roundUp(float val) { return result;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/math/math_util.h b/engines/wintermute/math/math_util.h index 258d9bd67b..506317a2b0 100644 --- a/engines/wintermute/math/math_util.h +++ b/engines/wintermute/math/math_util.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_MATHUTIL_H
#define WINTERMUTE_MATHUTIL_H
-namespace WinterMute {
+namespace Wintermute {
class MathUtil {
public:
@@ -37,6 +37,6 @@ public: static float roundUp(float val);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_MATHUTIL_H
diff --git a/engines/wintermute/math/matrix4.cpp b/engines/wintermute/math/matrix4.cpp index 379c219ec3..e38833d094 100644 --- a/engines/wintermute/math/matrix4.cpp +++ b/engines/wintermute/math/matrix4.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/math/vector2.h"
#include <math.h>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
Matrix4::Matrix4() {
@@ -83,4 +83,4 @@ void Matrix4::transformVector2(Vector2 &vec) { vec.y = y;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/math/matrix4.h b/engines/wintermute/math/matrix4.h index 4f65fe5779..5891b4c5ec 100644 --- a/engines/wintermute/math/matrix4.h +++ b/engines/wintermute/math/matrix4.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_MATRIX4_H
#define WINTERMUTE_MATRIX4_H
-namespace WinterMute {
+namespace Wintermute {
class Vector2;
@@ -54,6 +54,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_MATRIX4_H
diff --git a/engines/wintermute/math/rect32.h b/engines/wintermute/math/rect32.h index 428d49290c..51a1be15e4 100644 --- a/engines/wintermute/math/rect32.h +++ b/engines/wintermute/math/rect32.h @@ -25,7 +25,7 @@ #include "common/system.h" -namespace WinterMute { +namespace Wintermute { struct Point32 { int32 x; @@ -89,6 +89,6 @@ struct Rect32 { } }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif // WINTERMUTE_RECT32_H diff --git a/engines/wintermute/math/vector2.cpp b/engines/wintermute/math/vector2.cpp index ecf2f1e8e4..40c2b346d7 100644 --- a/engines/wintermute/math/vector2.cpp +++ b/engines/wintermute/math/vector2.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/math/vector2.h"
#include <math.h>
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
Vector2::Vector2() {
@@ -52,4 +52,4 @@ float Vector2::length() const { return (float)sqrt(x * x + y * y);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/math/vector2.h b/engines/wintermute/math/vector2.h index ca4f499794..ce7ebd331e 100644 --- a/engines/wintermute/math/vector2.h +++ b/engines/wintermute/math/vector2.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_VECTOR2_H
#define WINTERMUTE_VECTOR2_H
-namespace WinterMute {
+namespace Wintermute {
class Vector2 {
public:
@@ -70,6 +70,6 @@ public: float y;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_VECTOR2_H
diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp index fc1531ab9b..514fd61d34 100644 --- a/engines/wintermute/persistent.cpp +++ b/engines/wintermute/persistent.cpp @@ -91,9 +91,9 @@ // SystemClass adds these objects to the registry, thus they aren't as leaked as they look #define REGISTER_CLASS(class_name, persistent_class)\ - new WinterMute::SystemClass(class_name::_className, class_name::persistBuild, class_name::persistLoad, persistent_class); + new Wintermute::SystemClass(class_name::_className, class_name::persistBuild, class_name::persistLoad, persistent_class); -namespace WinterMute { +namespace Wintermute { // This is done in a separate file, to avoid including the kitchensink in SystemClassRegistry. void SystemClassRegistry::registerClasses() { diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h index 0df2f8420b..54b13e8ffe 100644 --- a/engines/wintermute/persistent.h +++ b/engines/wintermute/persistent.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_PERSISTENT_H #define WINTERMUTE_PERSISTENT_H -namespace WinterMute { +namespace Wintermute { class BasePersistenceManager; @@ -37,10 +37,10 @@ class BasePersistenceManager; typedef void *(*PERSISTBUILD)(void); typedef bool(*PERSISTLOAD)(void *, BasePersistenceManager *); typedef void (*SYS_INSTANCE_CALLBACK)(void *Instance, void *Data); -} // end of namespace WinterMute +} // end of namespace Wintermute #include "engines/wintermute/system/sys_class_registry.h" -namespace WinterMute { +namespace Wintermute { #define DECLARE_PERSISTENT(class_name, parent_class)\ @@ -84,6 +84,6 @@ namespace WinterMute { #define TMEMBER(member_name) #member_name, &member_name #define TMEMBER_INT(member_name) #member_name, (int*)&member_name -} // end of namespace WinterMute +} // end of namespace Wintermute #endif // WINTERMUTE_PERSISTENT_H diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp index a1220cfa45..c50645df95 100644 --- a/engines/wintermute/platform_osystem.cpp +++ b/engines/wintermute/platform_osystem.cpp @@ -33,7 +33,7 @@ #include "common/textconsole.h"
#include "common/system.h"
-namespace WinterMute {
+namespace Wintermute {
BaseGame *BasePlatform::_gameRef = NULL;
@@ -259,4 +259,4 @@ char *BasePlatform::strlwr(char *string) { return string;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/platform_osystem.h b/engines/wintermute/platform_osystem.h index ffc9933635..9f281c89cd 100644 --- a/engines/wintermute/platform_osystem.h +++ b/engines/wintermute/platform_osystem.h @@ -33,7 +33,7 @@ #include "engines/wintermute/math/rect32.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseGame;
@@ -64,10 +64,10 @@ public: static char *strlwr(char *string);
private:
- // Set by initialize on game-startup, the object referred to is also deleted by deinit in WinterMuteEngine
+ // Set by initialize on game-startup, the object referred to is also deleted by deinit in WintermuteEngine
static BaseGame *_gameRef;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/system/sys_class.cpp b/engines/wintermute/system/sys_class.cpp index ce06e8980e..bce9a04aec 100644 --- a/engines/wintermute/system/sys_class.cpp +++ b/engines/wintermute/system/sys_class.cpp @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
SystemClass::SystemClass(const AnsiString &name, PERSISTBUILD build, PERSISTLOAD load, bool persistentClass) {
@@ -217,4 +217,4 @@ void SystemClass::instanceCallback(SYS_INSTANCE_CALLBACK lpCallback, void *lpDat }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/system/sys_class.h b/engines/wintermute/system/sys_class.h index 36968e1cc2..28d718bb47 100644 --- a/engines/wintermute/system/sys_class.h +++ b/engines/wintermute/system/sys_class.h @@ -35,7 +35,7 @@ #include "common/func.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class SystemInstance;
class BaseGame;
class BasePersistenceManager;
@@ -52,8 +52,8 @@ template<> struct Hash<void *> : public UnaryFunction<void *, uint> { }
};
-template<> struct Hash<WinterMute::SystemInstance *> : public UnaryFunction<WinterMute::SystemInstance *, uint> {
- uint operator()(WinterMute::SystemInstance *val) const {
+template<> struct Hash<Wintermute::SystemInstance *> : public UnaryFunction<Wintermute::SystemInstance *, uint> {
+ uint operator()(Wintermute::SystemInstance *val) const {
return (uint)((size_t)val);
}
};
@@ -61,7 +61,7 @@ template<> struct Hash<WinterMute::SystemInstance *> : public UnaryFunction<Wint }
-namespace WinterMute {
+namespace Wintermute {
class SystemClass {
public:
@@ -125,6 +125,6 @@ private: InstanceMap _instanceMap;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/system/sys_class_registry.cpp b/engines/wintermute/system/sys_class_registry.cpp index b9e9bc8878..d836b32635 100644 --- a/engines/wintermute/system/sys_class_registry.cpp +++ b/engines/wintermute/system/sys_class_registry.cpp @@ -35,7 +35,7 @@ #include "engines/wintermute/wintermute.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
SystemClassRegistry::SystemClassRegistry() {
@@ -83,7 +83,7 @@ bool SystemClassRegistry::unregisterClass(SystemClass *classObj) { }
if (classObj->getNumInstances() != 0) {
- debugC(WinterMute::kWinterMuteDebugSaveGame, "Memory leak@class %-20s: %d instance(s) left\n", classObj->getName().c_str(), classObj->getNumInstances());
+ debugC(Wintermute::kWintermuteDebugSaveGame, "Memory leak@class %-20s: %d instance(s) left\n", classObj->getName().c_str(), classObj->getNumInstances());
}
_classes.erase(it);
@@ -332,4 +332,4 @@ void SystemClassRegistry::dumpClasses(Common::WriteStream *stream) { }
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/system/sys_class_registry.h b/engines/wintermute/system/sys_class_registry.h index 65d4fe1f02..e612ab3e82 100644 --- a/engines/wintermute/system/sys_class_registry.h +++ b/engines/wintermute/system/sys_class_registry.h @@ -37,21 +37,21 @@ #include "common/func.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class SystemClass;
}
namespace Common {
template<typename T> struct Hash;
-template<> struct Hash<WinterMute::SystemClass *> : public UnaryFunction<WinterMute::SystemClass *, uint> {
- uint operator()(WinterMute::SystemClass *val) const {
+template<> struct Hash<Wintermute::SystemClass *> : public UnaryFunction<Wintermute::SystemClass *, uint> {
+ uint operator()(Wintermute::SystemClass *val) const {
return (uint)((size_t)val);
}
};
}
-namespace WinterMute {
+namespace Wintermute {
class BaseGame;
class BasePersistenceManager;
@@ -101,6 +101,6 @@ public: };
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/system/sys_instance.cpp b/engines/wintermute/system/sys_instance.cpp index a5ef69647c..1323382152 100644 --- a/engines/wintermute/system/sys_instance.cpp +++ b/engines/wintermute/system/sys_instance.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/system/sys_class_registry.h"
#include "engines/wintermute/system/sys_class.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
SystemInstance::SystemInstance(void *instance, int id, SystemClass *sysClass) {
@@ -46,4 +46,4 @@ SystemInstance::SystemInstance(void *instance, int id, SystemClass *sysClass) { SystemInstance::~SystemInstance() {
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/system/sys_instance.h b/engines/wintermute/system/sys_instance.h index 90336742f8..78eb27c122 100644 --- a/engines/wintermute/system/sys_instance.h +++ b/engines/wintermute/system/sys_instance.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_SYSINSTANCE_H
#define WINTERMUTE_SYSINSTANCE_H
-namespace WinterMute {
+namespace Wintermute {
class SystemClass;
@@ -63,6 +63,6 @@ private: SystemClass *_class;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp index fb125ef94c..d13ad235bc 100644 --- a/engines/wintermute/ui/ui_button.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -41,7 +41,7 @@ #include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIButton, false)
@@ -1205,4 +1205,4 @@ bool UIButton::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h index 5c034d6113..61cdef476e 100644 --- a/engines/wintermute/ui/ui_button.h +++ b/engines/wintermute/ui/ui_button.h @@ -33,7 +33,7 @@ #include "engines/wintermute/ui/ui_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
-namespace WinterMute {
+namespace Wintermute {
class UIButton : public UIObject {
public:
@@ -74,6 +74,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index 88c68a3314..23c783d200 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -47,7 +47,7 @@ #include "common/util.h"
#include "common/keyboard.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIEdit, false)
@@ -948,4 +948,4 @@ bool UIEdit::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_edit.h b/engines/wintermute/ui/ui_edit.h index 221b8aa151..ea943e3d57 100644 --- a/engines/wintermute/ui/ui_edit.h +++ b/engines/wintermute/ui/ui_edit.h @@ -33,7 +33,7 @@ #include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseFont;
class UIEdit : public UIObject {
public:
@@ -67,6 +67,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_entity.cpp b/engines/wintermute/ui/ui_entity.cpp index 8008e96050..038b256c24 100644 --- a/engines/wintermute/ui/ui_entity.cpp +++ b/engines/wintermute/ui/ui_entity.cpp @@ -36,7 +36,7 @@ #include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/base/scriptables/script_stack.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIEntity, false)
@@ -363,4 +363,4 @@ bool UIEntity::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_entity.h b/engines/wintermute/ui/ui_entity.h index 9c9bffdc4a..bc44c1f112 100644 --- a/engines/wintermute/ui/ui_entity.h +++ b/engines/wintermute/ui/ui_entity.h @@ -31,7 +31,7 @@ #include "engines/wintermute/ui/ui_object.h"
-namespace WinterMute {
+namespace Wintermute {
class AdEntity;
class UIEntity : public UIObject {
public:
@@ -53,6 +53,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp index 8f1356020e..31f1b9aa33 100644 --- a/engines/wintermute/ui/ui_object.cpp +++ b/engines/wintermute/ui/ui_object.cpp @@ -36,7 +36,7 @@ #include "engines/wintermute/base/scriptables/script_stack.h"
#include "engines/wintermute/base/font/base_font_storage.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIObject, false)
@@ -647,4 +647,4 @@ bool UIObject::saveAsText(BaseDynamicBuffer *buffer, int indent) { return STATUS_FAILED;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h index 50d0a08873..8059207a9a 100644 --- a/engines/wintermute/ui/ui_object.h +++ b/engines/wintermute/ui/ui_object.h @@ -33,7 +33,7 @@ #include "engines/wintermute/base/base_object.h"
#include "engines/wintermute/dctypes.h" // Added by ClassView
-namespace WinterMute {
+namespace Wintermute {
class UITiledImage;
class BaseFont;
@@ -79,6 +79,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp index 56fea4edf9..038df55c42 100644 --- a/engines/wintermute/ui/ui_text.cpp +++ b/engines/wintermute/ui/ui_text.cpp @@ -41,7 +41,7 @@ #include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIText, false)
@@ -519,4 +519,4 @@ bool UIText::sizeToFit() { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_text.h b/engines/wintermute/ui/ui_text.h index ee2e63c448..54817ccf52 100644 --- a/engines/wintermute/ui/ui_text.h +++ b/engines/wintermute/ui/ui_text.h @@ -32,7 +32,7 @@ #include "engines/wintermute/ui/ui_object.h"
-namespace WinterMute {
+namespace Wintermute {
class UIText : public UIObject {
private:
@@ -55,6 +55,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_tiled_image.cpp b/engines/wintermute/ui/ui_tiled_image.cpp index 62c07bf1d7..0cf28b81f5 100644 --- a/engines/wintermute/ui/ui_tiled_image.cpp +++ b/engines/wintermute/ui/ui_tiled_image.cpp @@ -35,7 +35,7 @@ #include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UITiledImage, false)
@@ -390,4 +390,4 @@ bool UITiledImage::persist(BasePersistenceManager *persistMgr) { return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_tiled_image.h b/engines/wintermute/ui/ui_tiled_image.h index 2d7068e7cd..863bf7d1ea 100644 --- a/engines/wintermute/ui/ui_tiled_image.h +++ b/engines/wintermute/ui/ui_tiled_image.h @@ -33,7 +33,7 @@ #include "engines/wintermute/ui/ui_object.h"
#include "common/rect.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSubFrame;
class UITiledImage : public BaseObject {
public:
@@ -58,6 +58,6 @@ public: Rect32 _downRight;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp index 4f3ee9ff43..d33de9881c 100644 --- a/engines/wintermute/ui/ui_window.cpp +++ b/engines/wintermute/ui/ui_window.cpp @@ -47,7 +47,7 @@ #include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(UIWindow, false)
@@ -1441,4 +1441,4 @@ bool UIWindow::getWindowObjects(BaseArray<UIObject *> &objects, bool interactive return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/ui/ui_window.h b/engines/wintermute/ui/ui_window.h index 556850f6fa..8093e2b8f4 100644 --- a/engines/wintermute/ui/ui_window.h +++ b/engines/wintermute/ui/ui_window.h @@ -33,7 +33,7 @@ #include "engines/wintermute/ui/ui_object.h"
#include "common/events.h"
-namespace WinterMute {
+namespace Wintermute {
class UIButton;
class BaseViewport;
@@ -89,6 +89,6 @@ public: virtual const char *scToString();
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/utils/crc.cpp b/engines/wintermute/utils/crc.cpp index c127d08417..8f608600f3 100644 --- a/engines/wintermute/utils/crc.cpp +++ b/engines/wintermute/utils/crc.cpp @@ -17,7 +17,7 @@ #include "engines/wintermute/utils/crc.h"
-namespace WinterMute {
+namespace Wintermute {
/*
* Derive parameters from the standard-specific parameters in crc.h.
@@ -234,4 +234,4 @@ crc crc_finalize(crc remainder) { return (REFLECT_REMAINDER(remainder) ^ FINAL_XOR_VALUE);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/crc.h b/engines/wintermute/utils/crc.h index 363340531d..9b9446ce57 100644 --- a/engines/wintermute/utils/crc.h +++ b/engines/wintermute/utils/crc.h @@ -18,7 +18,7 @@ #include "common/system.h" // For types.
-namespace WinterMute {
+namespace Wintermute {
#ifndef TRUE
#define FALSE 0
@@ -80,6 +80,6 @@ extern "C" crc crc_initialize(void); extern "C" crc crc_process_byte(unsigned char byteVal, crc remainder);
extern "C" crc crc_finalize(crc remainder);
-} // End of namespace WinterMute
+} // End of namespace Wintermute
#endif /* _crc_h */
diff --git a/engines/wintermute/utils/path_util.cpp b/engines/wintermute/utils/path_util.cpp index dcf35be776..55bf776848 100644 --- a/engines/wintermute/utils/path_util.cpp +++ b/engines/wintermute/utils/path_util.cpp @@ -29,7 +29,7 @@ #include "common/file.h"
#include "engines/wintermute/utils/path_util.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
AnsiString PathUtil::unifySeparators(const AnsiString &path) {
@@ -98,4 +98,4 @@ AnsiString PathUtil::getExtension(const AnsiString &path) { return Common::lastPathComponent(path, '.');
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/path_util.h b/engines/wintermute/utils/path_util.h index f63c15dcd1..ed8f3e91e8 100644 --- a/engines/wintermute/utils/path_util.h +++ b/engines/wintermute/utils/path_util.h @@ -31,7 +31,7 @@ #include "engines/wintermute/dctypes.h"
-namespace WinterMute {
+namespace Wintermute {
class PathUtil {
public:
@@ -44,6 +44,6 @@ public: static AnsiString getExtension(const AnsiString &path);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_PATHUTILS_H
diff --git a/engines/wintermute/utils/string_util.cpp b/engines/wintermute/utils/string_util.cpp index ed1d2094d2..63793f7d0b 100644 --- a/engines/wintermute/utils/string_util.cpp +++ b/engines/wintermute/utils/string_util.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/utils/convert_utf.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
bool StringUtil::compareNoCase(const AnsiString &str1, const AnsiString &str2) {
@@ -229,4 +229,4 @@ AnsiString StringUtil::toString(int val) { }
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/string_util.h b/engines/wintermute/utils/string_util.h index 582007917d..581ffc2ed4 100644 --- a/engines/wintermute/utils/string_util.h +++ b/engines/wintermute/utils/string_util.h @@ -31,7 +31,7 @@ #include "engines/wintermute/dctypes.h"
-namespace WinterMute {
+namespace Wintermute {
class StringUtil {
public:
@@ -51,6 +51,6 @@ public: static AnsiString toString(int val);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_STRINGUTIL_H
diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp index 4546750c61..f26d60b7cf 100644 --- a/engines/wintermute/utils/utils.cpp +++ b/engines/wintermute/utils/utils.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/wintermute.h"
#include "engines/wintermute/base/base_engine.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
static inline unsigned Sqr(int x) {
@@ -258,4 +258,4 @@ float BaseUtils::Hue2RGB(float v1, float v2, float vH) { return (v1);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h index 36a7398869..af69bd4523 100644 --- a/engines/wintermute/utils/utils.h +++ b/engines/wintermute/utils/utils.h @@ -32,7 +32,7 @@ #include "engines/wintermute/wintypes.h"
#include "engines/wintermute/math/rect32.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseGame;
@@ -59,6 +59,6 @@ private: static float Hue2RGB(float v1, float v2, float vH);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/video/decoders/theora_decoder.cpp b/engines/wintermute/video/decoders/theora_decoder.cpp index a8e403c97c..6267e300f9 100644 --- a/engines/wintermute/video/decoders/theora_decoder.cpp +++ b/engines/wintermute/video/decoders/theora_decoder.cpp @@ -45,7 +45,7 @@ #include "common/stream.h" #include "common/debug.h" -namespace WinterMute { +namespace Wintermute { #define AUDIOFD_FRAGSIZE 10240 diff --git a/engines/wintermute/video/decoders/theora_decoder.h b/engines/wintermute/video/decoders/theora_decoder.h index 3844434036..fd94f52142 100644 --- a/engines/wintermute/video/decoders/theora_decoder.h +++ b/engines/wintermute/video/decoders/theora_decoder.h @@ -41,7 +41,7 @@ namespace Common { class SeekableReadStream; } -namespace WinterMute { +namespace Wintermute { /** * diff --git a/engines/wintermute/video/video_player.cpp b/engines/wintermute/video/video_player.cpp index a3eedaa293..2577b8aedc 100644 --- a/engines/wintermute/video/video_player.cpp +++ b/engines/wintermute/video/video_player.cpp @@ -29,7 +29,7 @@ #include "engines/wintermute/video/video_player.h" -namespace WinterMute { +namespace Wintermute { ////////////////////////////////////////////////////////////////////// // Construction/Destruction @@ -106,4 +106,4 @@ bool VideoPlayer::loadSubtitles(const char *filename, const char *subtitleFile) return STATUS_OK; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/video/video_player.h b/engines/wintermute/video/video_player.h index 190223c6d1..d5466da679 100644 --- a/engines/wintermute/video/video_player.h +++ b/engines/wintermute/video/video_player.h @@ -36,7 +36,7 @@ #define MAX_VIDEO_STREAMS 5 -namespace WinterMute { +namespace Wintermute { // AVI-Video-player, currently fully stubbed class VideoPlayer : public BaseClass { @@ -85,6 +85,6 @@ public: BaseArray<CVidSubtitle *, CVidSubtitle *> _subtitles;*/ }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp index fea81bdf9d..f75c7ba5b6 100644 --- a/engines/wintermute/video/video_theora_player.cpp +++ b/engines/wintermute/video/video_theora_player.cpp @@ -39,7 +39,7 @@ #include "engines/wintermute/wintermute.h" #include "common/system.h" -namespace WinterMute { +namespace Wintermute { IMPLEMENT_PERSISTENT(VideoTheoraPlayer, false) @@ -272,7 +272,7 @@ bool VideoTheoraPlayer::update() { warning("Should loop movie %s", _filename.c_str()); _theoraDecoder->rewind(); } else if (_theoraDecoder->endOfVideo() && !_looping) { - debugC(kWinterMuteDebugLog, "Finished movie %s", _filename.c_str()); + debugC(kWintermuteDebugLog, "Finished movie %s", _filename.c_str()); _state = THEORA_STATE_FINISHED; _playbackStarted = false; if (_freezeGame) { @@ -497,4 +497,4 @@ BaseSurface *VideoTheoraPlayer::getTexture() { return _texture; } -} // end of namespace WinterMute +} // end of namespace Wintermute diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h index fe71ae0f35..cd358381f1 100644 --- a/engines/wintermute/video/video_theora_player.h +++ b/engines/wintermute/video/video_theora_player.h @@ -35,7 +35,7 @@ #include "common/stream.h" #include "graphics/surface.h" -namespace WinterMute { +namespace Wintermute { class BaseSurface; class BaseImage; class VideoTheoraPlayer : public BaseClass { @@ -144,6 +144,6 @@ private: }; -} // end of namespace WinterMute +} // end of namespace Wintermute #endif diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp index 186d80d446..6008a92c26 100644 --- a/engines/wintermute/wintermute.cpp +++ b/engines/wintermute/wintermute.cpp @@ -41,15 +41,15 @@ #include "engines/wintermute/base/base_file_manager.h" #include "engines/wintermute/base/scriptables/script_engine.h" -namespace WinterMute { +namespace Wintermute { // Simple constructor for detection - we need to setup the persistence to avoid special-casing in-engine // This might not be the prettiest solution -WinterMuteEngine::WinterMuteEngine() : Engine(g_system) { +WintermuteEngine::WintermuteEngine() : Engine(g_system) { _game = new AdGame(""); } -WinterMuteEngine::WinterMuteEngine(OSystem *syst, const ADGameDescription *desc) +WintermuteEngine::WintermuteEngine(OSystem *syst, const ADGameDescription *desc) : Engine(syst), _gameDescription(desc) { // Put your engine in a sane state, but do nothing big yet; // in particular, do not load data from files; rather, if you @@ -62,17 +62,17 @@ WinterMuteEngine::WinterMuteEngine(OSystem *syst, const ADGameDescription *desc) //SearchMan.addSubDirectoryMatching(gameDataDir, "sound"); // Here is the right place to set up the engine specific debug channels - DebugMan.addDebugChannel(kWinterMuteDebugLog, "enginelog", "Covers the same output as the log-file in WME"); - DebugMan.addDebugChannel(kWinterMuteDebugSaveGame, "savegame", "Savegames"); - DebugMan.addDebugChannel(kWinterMuteDebugFont, "font", "Text-drawing-related messages"); - DebugMan.addDebugChannel(kWinterMuteDebugFileAccess, "file-access", "Non-critical problems like missing files"); - DebugMan.addDebugChannel(kWinterMuteDebugAudio, "audio", "audio-playback-related issues"); - DebugMan.addDebugChannel(kWinterMuteDebugGeneral, "general", "various issues not covered by any of the above"); + DebugMan.addDebugChannel(kWintermuteDebugLog, "enginelog", "Covers the same output as the log-file in WME"); + DebugMan.addDebugChannel(kWintermuteDebugSaveGame, "savegame", "Savegames"); + DebugMan.addDebugChannel(kWintermuteDebugFont, "font", "Text-drawing-related messages"); + DebugMan.addDebugChannel(kWintermuteDebugFileAccess, "file-access", "Non-critical problems like missing files"); + DebugMan.addDebugChannel(kWintermuteDebugAudio, "audio", "audio-playback-related issues"); + DebugMan.addDebugChannel(kWintermuteDebugGeneral, "general", "various issues not covered by any of the above"); _game = NULL; } -WinterMuteEngine::~WinterMuteEngine() { +WintermuteEngine::~WintermuteEngine() { // Dispose your resources here deinit(); delete _game; @@ -82,7 +82,7 @@ WinterMuteEngine::~WinterMuteEngine() { DebugMan.clearAllDebugChannels(); } -bool WinterMuteEngine::hasFeature(EngineFeature f) const { +bool WintermuteEngine::hasFeature(EngineFeature f) const { switch (f) { case kSupportsRTL: return true; @@ -96,7 +96,7 @@ bool WinterMuteEngine::hasFeature(EngineFeature f) const { return false; } -Common::Error WinterMuteEngine::run() { +Common::Error WintermuteEngine::run() { // Initialize graphics using following: Graphics::PixelFormat format(4, 8, 8, 8, 8, 16, 8, 0, 24); initGraphics(800, 600, true, &format); @@ -108,16 +108,16 @@ Common::Error WinterMuteEngine::run() { _console = new Console(this); // DebugMan.enableDebugChannel("enginelog"); - debugC(1, kWinterMuteDebugLog, "Engine Debug-LOG enabled"); - debugC(2, kWinterMuteDebugSaveGame , "Savegame debugging-enabled"); + debugC(1, kWintermuteDebugLog, "Engine Debug-LOG enabled"); + debugC(2, kWintermuteDebugSaveGame , "Savegame debugging-enabled"); int ret = 1; // Additional setup. - debugC(kWinterMuteDebugLog, "WinterMuteEngine::init"); + debugC(kWintermuteDebugLog, "WintermuteEngine::init"); ret = init(); - debugC(kWinterMuteDebugLog, "WinterMuteEngine::messageLoop"); + debugC(kWintermuteDebugLog, "WintermuteEngine::messageLoop"); if (ret == 0) { ret = messageLoop(); } @@ -125,7 +125,7 @@ Common::Error WinterMuteEngine::run() { return Common::kNoError; } -int WinterMuteEngine::init() { +int WintermuteEngine::init() { BaseEngine::createInstance(_targetName); _game = new AdGame(_targetName); if (!_game) { @@ -221,7 +221,7 @@ int WinterMuteEngine::init() { return 0; } -int WinterMuteEngine::messageLoop() { +int WintermuteEngine::messageLoop() { bool done = false; uint32 prevTime = _system->getMillis(); @@ -269,29 +269,29 @@ int WinterMuteEngine::messageLoop() { return 0; } -void WinterMuteEngine::deinit() { +void WintermuteEngine::deinit() { BaseEngine::destroy(); } -Common::Error WinterMuteEngine::loadGameState(int slot) { +Common::Error WintermuteEngine::loadGameState(int slot) { BaseEngine::instance().getGameRef()->loadGame(slot); return Common::kNoError; } -Common::Error WinterMuteEngine::saveGameState(int slot, const Common::String &desc) { +Common::Error WintermuteEngine::saveGameState(int slot, const Common::String &desc) { BaseEngine::instance().getGameRef()->saveGame(slot, desc.c_str(), false); return Common::kNoError; } -bool WinterMuteEngine::canSaveGameStateCurrently() { +bool WintermuteEngine::canSaveGameStateCurrently() { return true; } -bool WinterMuteEngine::canLoadGameStateCurrently() { +bool WintermuteEngine::canLoadGameStateCurrently() { return true; } -bool WinterMuteEngine::getGameInfo(const Common::FSList &fslist, Common::String &name, Common::String &caption) { +bool WintermuteEngine::getGameInfo(const Common::FSList &fslist, Common::String &name, Common::String &caption) { bool retVal = false; caption = name = "(invalid)"; Common::SeekableReadStream *stream = NULL; @@ -379,4 +379,4 @@ bool WinterMuteEngine::getGameInfo(const Common::FSList &fslist, Common::String return retVal; } -} // End of namespace WinterMute +} // End of namespace Wintermute diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h index 8607c50e25..730a4e8358 100644 --- a/engines/wintermute/wintermute.h +++ b/engines/wintermute/wintermute.h @@ -27,26 +27,26 @@ #include "engines/advancedDetector.h" #include "gui/debugger.h" -namespace WinterMute { +namespace Wintermute { class Console; class BaseGame; class SystemClassRegistry; // our engine debug channels enum { - kWinterMuteDebugLog = 1 << 0, // The debug-logs from the original engine - kWinterMuteDebugSaveGame = 1 << 1, - kWinterMuteDebugFont = 1 << 2, // next new channel must be 1 << 2 (4) - kWinterMuteDebugFileAccess = 1 << 3, // the current limitation is 32 debug channels (1 << 31 is the last one) - kWinterMuteDebugAudio = 1 << 4, - kWinterMuteDebugGeneral = 1 << 5 + kWintermuteDebugLog = 1 << 0, // The debug-logs from the original engine + kWintermuteDebugSaveGame = 1 << 1, + kWintermuteDebugFont = 1 << 2, // next new channel must be 1 << 2 (4) + kWintermuteDebugFileAccess = 1 << 3, // the current limitation is 32 debug channels (1 << 31 is the last one) + kWintermuteDebugAudio = 1 << 4, + kWintermuteDebugGeneral = 1 << 5 }; -class WinterMuteEngine : public Engine { +class WintermuteEngine : public Engine { public: - WinterMuteEngine(OSystem *syst, const ADGameDescription *desc); - WinterMuteEngine(); - ~WinterMuteEngine(); + WintermuteEngine(OSystem *syst, const ADGameDescription *desc); + WintermuteEngine(); + ~WintermuteEngine(); virtual Common::Error run(); virtual bool hasFeature(EngineFeature f) const; @@ -69,7 +69,7 @@ private: // Example console class class Console : public GUI::Debugger { public: - Console(WinterMuteEngine *vm) {} + Console(WintermuteEngine *vm) {} virtual ~Console(void) {} }; diff --git a/engines/wintermute/wintypes.h b/engines/wintermute/wintypes.h index 4b2fc5bada..7a84dd2810 100644 --- a/engines/wintermute/wintypes.h +++ b/engines/wintermute/wintypes.h @@ -31,7 +31,7 @@ #include "common/scummsys.h"
-namespace WinterMute {
+namespace Wintermute {
#define BYTETORGBA(r,g,b,a) ((uint32)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff)))
@@ -48,6 +48,6 @@ namespace WinterMute { #define MAX_PATH_LENGTH 512
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_WINTYPES_H
|