[Scummvm-cvs-logs] SF.net SVN: scummvm:[53261] scummvm/trunk/engines/sword25
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Oct 13 00:59:02 CEST 2010
Revision: 53261
http://scummvm.svn.sourceforge.net/scummvm/?rev=53261&view=rev
Author: sev
Date: 2010-10-12 22:59:01 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: removed BS_ prefix from rest of the classes.
The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.
Modified Paths:
--------------
scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
scummvm/trunk/engines/sword25/fmv/movieplayer.h
scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
scummvm/trunk/engines/sword25/gfx/animation.cpp
scummvm/trunk/engines/sword25/gfx/animation.h
scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
scummvm/trunk/engines/sword25/gfx/animationdescription.h
scummvm/trunk/engines/sword25/gfx/animationresource.cpp
scummvm/trunk/engines/sword25/gfx/animationresource.h
scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
scummvm/trunk/engines/sword25/gfx/animationtemplate.h
scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
scummvm/trunk/engines/sword25/gfx/bitmap.cpp
scummvm/trunk/engines/sword25/gfx/bitmap.h
scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
scummvm/trunk/engines/sword25/gfx/bitmapresource.h
scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
scummvm/trunk/engines/sword25/gfx/fontresource.cpp
scummvm/trunk/engines/sword25/gfx/fontresource.h
scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
scummvm/trunk/engines/sword25/gfx/graphicengine.h
scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp
scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp
scummvm/trunk/engines/sword25/gfx/panel.cpp
scummvm/trunk/engines/sword25/gfx/panel.h
scummvm/trunk/engines/sword25/gfx/renderobject.cpp
scummvm/trunk/engines/sword25/gfx/renderobject.h
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp
scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
scummvm/trunk/engines/sword25/gfx/rootrenderobject.h
scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp
scummvm/trunk/engines/sword25/gfx/staticbitmap.h
scummvm/trunk/engines/sword25/gfx/text.cpp
scummvm/trunk/engines/sword25/gfx/text.h
scummvm/trunk/engines/sword25/input/inputengine.cpp
scummvm/trunk/engines/sword25/input/inputengine.h
scummvm/trunk/engines/sword25/input/inputengine_script.cpp
scummvm/trunk/engines/sword25/input/scummvminput.cpp
scummvm/trunk/engines/sword25/input/scummvminput.h
scummvm/trunk/engines/sword25/kernel/filesystemutil.cpp
scummvm/trunk/engines/sword25/kernel/filesystemutil.h
scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp
scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h
scummvm/trunk/engines/sword25/kernel/kernel.cpp
scummvm/trunk/engines/sword25/kernel/kernel.h
scummvm/trunk/engines/sword25/kernel/kernel_script.cpp
scummvm/trunk/engines/sword25/kernel/objectregistry.h
scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.cpp
scummvm/trunk/engines/sword25/kernel/outputpersistenceblock.h
scummvm/trunk/engines/sword25/kernel/persistable.h
scummvm/trunk/engines/sword25/kernel/persistenceblock.h
scummvm/trunk/engines/sword25/kernel/persistenceservice.cpp
scummvm/trunk/engines/sword25/kernel/persistenceservice.h
scummvm/trunk/engines/sword25/kernel/resmanager.cpp
scummvm/trunk/engines/sword25/kernel/resmanager.h
scummvm/trunk/engines/sword25/kernel/resource.cpp
scummvm/trunk/engines/sword25/kernel/resource.h
scummvm/trunk/engines/sword25/kernel/resservice.h
scummvm/trunk/engines/sword25/kernel/scummvmwindow.cpp
scummvm/trunk/engines/sword25/kernel/scummvmwindow.h
scummvm/trunk/engines/sword25/kernel/service.h
scummvm/trunk/engines/sword25/kernel/service_ids.h
scummvm/trunk/engines/sword25/kernel/window.cpp
scummvm/trunk/engines/sword25/kernel/window.h
scummvm/trunk/engines/sword25/math/geometry.cpp
scummvm/trunk/engines/sword25/math/geometry.h
scummvm/trunk/engines/sword25/math/geometry_script.cpp
scummvm/trunk/engines/sword25/math/polygon.cpp
scummvm/trunk/engines/sword25/math/polygon.h
scummvm/trunk/engines/sword25/math/region.cpp
scummvm/trunk/engines/sword25/math/region.h
scummvm/trunk/engines/sword25/math/regionregistry.cpp
scummvm/trunk/engines/sword25/math/regionregistry.h
scummvm/trunk/engines/sword25/math/walkregion.cpp
scummvm/trunk/engines/sword25/math/walkregion.h
scummvm/trunk/engines/sword25/package/packagemanager.cpp
scummvm/trunk/engines/sword25/package/packagemanager.h
scummvm/trunk/engines/sword25/package/packagemanager_script.cpp
scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp
scummvm/trunk/engines/sword25/package/scummvmpackagemanager.h
scummvm/trunk/engines/sword25/script/luascript.cpp
scummvm/trunk/engines/sword25/script/luascript.h
scummvm/trunk/engines/sword25/script/script.h
scummvm/trunk/engines/sword25/sfx/fmodexsound.cpp
scummvm/trunk/engines/sword25/sfx/fmodexsound.h
scummvm/trunk/engines/sword25/sfx/soundengine.cpp
scummvm/trunk/engines/sword25/sfx/soundengine.h
scummvm/trunk/engines/sword25/sfx/soundengine_script.cpp
scummvm/trunk/engines/sword25/sword25.cpp
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -38,11 +38,11 @@
#define BS_LOG_PREFIX "MOVIEPLAYER"
-BS_Service *OggTheora_CreateObject(BS_Kernel *pKernel) {
+Service *OggTheora_CreateObject(Kernel *pKernel) {
return new MoviePlayer(pKernel);
}
-MoviePlayer::MoviePlayer(BS_Kernel *pKernel) : BS_Service(pKernel) {
+MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel) {
if (!_RegisterScriptBindings())
BS_LOG_ERRORLN("Script bindings could not be registered.");
else
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -48,13 +48,13 @@
// Class definitions
// -----------------------------------------------------------------------------
-class MoviePlayer : public BS_Service {
+class MoviePlayer : public Service {
public:
// -----------------------------------------------------------------------------
// Constructor / Destructor
// -----------------------------------------------------------------------------
- MoviePlayer(BS_Kernel *pKernel);
+ MoviePlayer(Kernel *pKernel);
~MoviePlayer() {};
// -----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -46,7 +46,7 @@
namespace Sword25 {
int LoadMovie(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->LoadMovie(luaL_checkstring(L, 1), lua_gettop(L) == 2 ? static_cast<unsigned int>(luaL_checknumber(L, 2)) : 10));
@@ -57,7 +57,7 @@
// -------------------------------------------------------------------------
int UnloadMovie(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->UnloadMovie());
@@ -68,7 +68,7 @@
// -------------------------------------------------------------------------
int Play(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->Play());
@@ -79,7 +79,7 @@
// -------------------------------------------------------------------------
int Pause(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->Pause());
@@ -90,7 +90,7 @@
// -------------------------------------------------------------------------
int Update(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
FMVPtr->Update();
@@ -101,7 +101,7 @@
// -------------------------------------------------------------------------
int IsMovieLoaded(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->IsMovieLoaded());
@@ -112,7 +112,7 @@
// -------------------------------------------------------------------------
int IsPaused(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushbooleancpp(L, FMVPtr->IsPaused());
@@ -123,7 +123,7 @@
// -------------------------------------------------------------------------
int GetScaleFactor(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushnumber(L, FMVPtr->GetScaleFactor());
@@ -134,7 +134,7 @@
// -------------------------------------------------------------------------
int SetScaleFactor(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
FMVPtr->SetScaleFactor(static_cast<float>(luaL_checknumber(L, 1)));
@@ -145,7 +145,7 @@
// -------------------------------------------------------------------------
int GetTime(lua_State *L) {
- MoviePlayer *FMVPtr = BS_Kernel::GetInstance()->GetFMV();
+ MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
BS_ASSERT(FMVPtr);
lua_pushnumber(L, FMVPtr->GetTime());
@@ -172,7 +172,7 @@
};
bool MoviePlayer::_RegisterScriptBindings() {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script"));
BS_ASSERT(pScript);
Modified: scummvm/trunk/engines/sword25/gfx/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animation.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -92,7 +92,7 @@
// -----------------------------------------------------------------------------
-Animation::Animation(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
+Animation::Animation(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
TimedRenderObject(ParentPtr, RenderObject::TYPE_ANIMATION, Handle) {
// Das BS_RenderObject konnte nicht erzeugt werden, daher muss an dieser Stelle abgebrochen werden.
if (!m_InitSuccess) return;
@@ -107,8 +107,8 @@
void Animation::InitializeAnimationResource(const Common::String &FileName) {
// Die Resource wird f\xFCr die gesamte Lebensdauer des Animations-Objektes gelockt.
- BS_Resource *ResourcePtr = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(FileName);
- if (ResourcePtr && ResourcePtr->GetType() == BS_Resource::TYPE_ANIMATION)
+ Resource *ResourcePtr = Kernel::GetInstance()->GetResourceManager()->RequestResource(FileName);
+ if (ResourcePtr && ResourcePtr->GetType() == Resource::TYPE_ANIMATION)
m_AnimationResourcePtr = static_cast<AnimationResource *>(ResourcePtr);
else {
BS_LOG_ERRORLN("The resource \"%s\" could not be requested. The Animation can't be created.", FileName.c_str());
@@ -207,13 +207,13 @@
BS_ASSERT(m_CurrentFrame < animationDescriptionPtr->GetFrameCount());
// Bitmap des aktuellen Frames holen
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(m_CurrentFrame).FileName);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(m_CurrentFrame).FileName);
BS_ASSERT(pResource);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
BitmapResource *pBitmapResource = static_cast<BitmapResource *>(pResource);
// Framebufferobjekt holen
- GraphicEngine *pGfx = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
+ GraphicEngine *pGfx = static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx"));
BS_ASSERT(pGfx);
// Bitmap zeichnen
@@ -346,9 +346,9 @@
BS_ASSERT(animationDescriptionPtr);
const AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
BS_ASSERT(pResource);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
BitmapResource *pBitmap = static_cast<BitmapResource *>(pResource);
// Gr\xF6\xDFe des Bitmaps auf die Animation \xFCbertragen
@@ -371,7 +371,7 @@
AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
for (unsigned int i = 0; i < animationDescriptionPtr->GetFrameCount(); ++i) {
- if (!BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(i).FileName)) {
+ if (!Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(i).FileName)) {
BS_LOG_ERRORLN("Could not lock all animation frames.");
return false;
}
@@ -390,8 +390,8 @@
AnimationDescription *animationDescriptionPtr = GetAnimationDescription();
BS_ASSERT(animationDescriptionPtr);
for (unsigned int i = 0; i < animationDescriptionPtr->GetFrameCount(); ++i) {
- BS_Resource *pResource;
- if (!(pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(i).FileName))) {
+ Resource *pResource;
+ if (!(pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(animationDescriptionPtr->GetFrame(i).FileName))) {
BS_LOG_ERRORLN("Could not unlock all animation frames.");
return false;
}
@@ -602,9 +602,9 @@
BS_ASSERT(animationDescriptionPtr);
const AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
BS_ASSERT(pResource);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
BitmapResource *pBitmap = static_cast<BitmapResource *>(pResource);
int Result = CurFrame.FlipV ? - static_cast<int>((pBitmap->GetWidth() - 1 - CurFrame.HotspotX) * m_ScaleFactorX) :
@@ -622,9 +622,9 @@
BS_ASSERT(animationDescriptionPtr);
const AnimationResource::Frame &CurFrame = animationDescriptionPtr->GetFrame(m_CurrentFrame);
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(CurFrame.FileName);
BS_ASSERT(pResource);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
BitmapResource *pBitmap = static_cast<BitmapResource *>(pResource);
int Result = CurFrame.FlipH ? - static_cast<int>((pBitmap->GetHeight() - 1 - CurFrame.HotspotY) * m_ScaleFactorY) :
@@ -666,7 +666,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-void Animation::PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
+void Animation::PersistCallbackVector(OutputPersistenceBlock &Writer, const Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
// Anzahl an Callbacks persistieren.
Writer.Write(Vector.size());
@@ -682,7 +682,7 @@
// -----------------------------------------------------------------------------
-void Animation::UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
+void Animation::UnpersistCallbackVector(InputPersistenceBlock &Reader, Common::Array<ANIMATION_CALLBACK_DATA> & Vector) {
// Callbackvector leeren.
Vector.resize(0);
@@ -706,7 +706,7 @@
// -----------------------------------------------------------------------------
-bool Animation::Persist(BS_OutputPersistenceBlock &Writer) {
+bool Animation::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
Result &= RenderObject::Persist(Writer);
@@ -749,7 +749,7 @@
// -----------------------------------------------------------------------------
-bool Animation::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool Animation::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
Result &= RenderObject::Unpersist(Reader);
Modified: scummvm/trunk/engines/sword25/gfx/animation.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animation.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -46,12 +46,12 @@
namespace Sword25 {
// Forward declarations
-class BS_Kernel;
+class Kernel;
class BS_PackageManager;
class AnimationResource;
class AnimationTemplate;
class AnimationDescription;
-class BS_InputPersistenceBlock;
+class InputPersistenceBlock;
class Animation : public TimedRenderObject {
friend class RenderObject;
@@ -59,7 +59,7 @@
private:
Animation(RenderObjectPtr<RenderObject> ParentPtr, const Common::String &FileName);
Animation(RenderObjectPtr<RenderObject> ParentPtr, const AnimationTemplate &Template);
- Animation(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
+ Animation(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
public:
enum ANIMATION_TYPES {
@@ -135,8 +135,8 @@
return m_ScaleFactorY;
}
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
virtual void FrameNotification(int TimeElapsed);
@@ -221,8 +221,8 @@
int ComputeYModifier() const;
void InitMembers();
- void PersistCallbackVector(BS_OutputPersistenceBlock &Writer, const Common::Array<ANIMATION_CALLBACK_DATA> & Vector);
- void UnpersistCallbackVector(BS_InputPersistenceBlock &Reader, Common::Array<ANIMATION_CALLBACK_DATA> & Vector);
+ void PersistCallbackVector(OutputPersistenceBlock &Writer, const Common::Array<ANIMATION_CALLBACK_DATA> & Vector);
+ void UnpersistCallbackVector(InputPersistenceBlock &Reader, Common::Array<ANIMATION_CALLBACK_DATA> & Vector);
AnimationDescription *GetAnimationDescription() const;
void InitializeAnimationResource(const Common::String &FileName);
};
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -46,7 +46,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool AnimationDescription::Persist(BS_OutputPersistenceBlock &Writer) {
+bool AnimationDescription::Persist(OutputPersistenceBlock &Writer) {
Writer.Write(static_cast<unsigned int>(m_AnimationType));
Writer.Write(m_FPS);
Writer.Write(m_MillisPerFrame);
@@ -59,7 +59,7 @@
// -----------------------------------------------------------------------------
-bool AnimationDescription::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool AnimationDescription::Unpersist(InputPersistenceBlock &Reader) {
unsigned int AnimationType;
Reader.Read(AnimationType);
m_AnimationType = static_cast<Animation::ANIMATION_TYPES>(AnimationType);
Modified: scummvm/trunk/engines/sword25/gfx/animationdescription.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationdescription.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -49,7 +49,7 @@
// Klassendefinition
// -----------------------------------------------------------------------------
-class AnimationDescription : public BS_Persistable {
+class AnimationDescription : public Persistable {
protected:
AnimationDescription() :
m_AnimationType(Animation::AT_LOOP),
@@ -102,8 +102,8 @@
return m_ColorModulationAllowed;
}
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
protected:
Animation::ANIMATION_TYPES m_AnimationType;
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -65,10 +65,10 @@
// -----------------------------------------------------------------------------
AnimationResource::AnimationResource(const Common::String &FileName) :
- BS_Resource(FileName, BS_Resource::TYPE_ANIMATION),
+ Resource(FileName, Resource::TYPE_ANIMATION),
m_Valid(false) {
// Pointer auf den Package-Manager bekommen
- PackageManager *PackagePtr = BS_Kernel::GetInstance()->GetPackage();
+ PackageManager *PackagePtr = Kernel::GetInstance()->GetPackage();
BS_ASSERT(PackagePtr);
// Animations-XML laden
@@ -266,7 +266,7 @@
bool AnimationResource::PrecacheAllFrames() const {
Common::Array<Frame>::const_iterator Iter = m_Frames.begin();
for (; Iter != m_Frames.end(); ++Iter) {
- if (!BS_Kernel::GetInstance()->GetResourceManager()->PrecacheResource((*Iter).FileName)) {
+ if (!Kernel::GetInstance()->GetResourceManager()->PrecacheResource((*Iter).FileName)) {
BS_LOG_ERRORLN("Could not precache \"%s\".", (*Iter).FileName.c_str());
return false;
}
@@ -289,7 +289,7 @@
Common::Array<Frame>::const_iterator Iter = m_Frames.begin();
for (; Iter != m_Frames.end(); ++Iter) {
BitmapResource *pBitmap;
- if (!(pBitmap = static_cast<BitmapResource *>(BS_Kernel::GetInstance()->GetResourceManager()->RequestResource((*Iter).FileName)))) {
+ if (!(pBitmap = static_cast<BitmapResource *>(Kernel::GetInstance()->GetResourceManager()->RequestResource((*Iter).FileName)))) {
BS_LOG_ERRORLN("Could not request \"%s\".", (*Iter).FileName.c_str());
return false;
}
Modified: scummvm/trunk/engines/sword25/gfx/animationresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationresource.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -56,14 +56,14 @@
// Forward Declarations
// -----------------------------------------------------------------------------
-class BS_Kernel;
+class Kernel;
class PackageManager;
// -----------------------------------------------------------------------------
// Class Definition
// -----------------------------------------------------------------------------
-class AnimationResource : public BS_Resource, public AnimationDescription {
+class AnimationResource : public Resource, public AnimationDescription {
public:
AnimationResource(const Common::String &FileName);
virtual ~AnimationResource();
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -79,7 +79,7 @@
// -----------------------------------------------------------------------------
-unsigned int AnimationTemplate::Create(BS_InputPersistenceBlock &Reader, unsigned int Handle) {
+unsigned int AnimationTemplate::Create(InputPersistenceBlock &Reader, unsigned int Handle) {
AnimationTemplate *AnimationTemplatePtr = new AnimationTemplate(Reader, Handle);
if (AnimationTemplatePtr->IsValid()) {
@@ -133,7 +133,7 @@
// -----------------------------------------------------------------------------
-AnimationTemplate::AnimationTemplate(BS_InputPersistenceBlock &Reader, unsigned int Handle) {
+AnimationTemplate::AnimationTemplate(InputPersistenceBlock &Reader, unsigned int Handle) {
// Objekt registrieren.
AnimationTemplateRegistry::GetInstance().RegisterObject(this, Handle);
@@ -144,9 +144,9 @@
// -----------------------------------------------------------------------------
AnimationResource *AnimationTemplate::RequestSourceAnimation(const Common::String &SourceAnimation) const {
- BS_ResourceManager *RMPtr = BS_Kernel::GetInstance()->GetResourceManager();
- BS_Resource *ResourcePtr;
- if (NULL == (ResourcePtr = RMPtr->RequestResource(SourceAnimation)) || ResourcePtr->GetType() != BS_Resource::TYPE_ANIMATION) {
+ ResourceManager *RMPtr = Kernel::GetInstance()->GetResourceManager();
+ Resource *ResourcePtr;
+ if (NULL == (ResourcePtr = RMPtr->RequestResource(SourceAnimation)) || ResourcePtr->GetType() != Resource::TYPE_ANIMATION) {
BS_LOG_ERRORLN("The resource \"%s\" could not be requested or is has an invalid type. The animation template can't be created.", SourceAnimation.c_str());
return 0;
}
@@ -212,7 +212,7 @@
// -----------------------------------------------------------------------------
-bool AnimationTemplate::Persist(BS_OutputPersistenceBlock &Writer) {
+bool AnimationTemplate::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
// Parent persistieren.
@@ -242,7 +242,7 @@
// -----------------------------------------------------------------------------
-bool AnimationTemplate::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool AnimationTemplate::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
// Parent wieder herstellen.
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplate.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplate.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -63,13 +63,13 @@
public:
static unsigned int Create(const Common::String &SourceAnimation);
static unsigned int Create(const AnimationTemplate &Other);
- static unsigned int Create(BS_InputPersistenceBlock &Reader, unsigned int Handle);
+ static unsigned int Create(InputPersistenceBlock &Reader, unsigned int Handle);
AnimationTemplate *ResolveHandle(unsigned int Handle) const;
private:
AnimationTemplate(const Common::String &SourceAnimation);
AnimationTemplate(const AnimationTemplate &Other);
- AnimationTemplate(BS_InputPersistenceBlock &Reader, unsigned int Handle);
+ AnimationTemplate(InputPersistenceBlock &Reader, unsigned int Handle);
public:
~AnimationTemplate();
@@ -119,8 +119,8 @@
*/
void SetFPS(int FPS);
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
private:
Common::Array<Frame> m_Frames;
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -69,7 +69,7 @@
// -----------------------------------------------------------------------------
-bool AnimationTemplateRegistry::Persist(BS_OutputPersistenceBlock &Writer) {
+bool AnimationTemplateRegistry::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
// Das n\xE4chste zu vergebene Handle schreiben.
@@ -95,7 +95,7 @@
// -----------------------------------------------------------------------------
-bool AnimationTemplateRegistry::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool AnimationTemplateRegistry::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
// Das n\xE4chste zu vergebene Handle wieder herstellen.
Modified: scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/animationtemplateregistry.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -59,15 +59,15 @@
// Klassendeklaration
// -----------------------------------------------------------------------------
-class AnimationTemplateRegistry : public BS_ObjectRegistry<AnimationTemplate>, public BS_Persistable {
+class AnimationTemplateRegistry : public ObjectRegistry<AnimationTemplate>, public Persistable {
public:
static AnimationTemplateRegistry &GetInstance() {
if (!m_InstancePtr.get()) m_InstancePtr.reset(new AnimationTemplateRegistry);
return *m_InstancePtr.get();
}
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
private:
virtual void LogErrorLn(const char *Message) const;
Modified: scummvm/trunk/engines/sword25/gfx/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -174,7 +174,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool Bitmap::Persist(BS_OutputPersistenceBlock &Writer) {
+bool Bitmap::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
Result &= RenderObject::Persist(Writer);
@@ -191,7 +191,7 @@
// -----------------------------------------------------------------------------
-bool Bitmap::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool Bitmap::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
Result &= RenderObject::Unpersist(Reader);
Modified: scummvm/trunk/engines/sword25/gfx/bitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/bitmap.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -179,8 +179,8 @@
virtual bool IsColorModulationAllowed() const = 0;
virtual bool IsSetContentAllowed() const = 0;
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
protected:
bool m_FlipH;
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -50,7 +50,7 @@
BitmapResource::BitmapResource(const Common::String &Filename, Image *pImage) :
m_Valid(false),
m_pImage(pImage),
- BS_Resource(Filename, BS_Resource::TYPE_BITMAP) {
+ Resource(Filename, Resource::TYPE_BITMAP) {
m_Valid = m_pImage != 0;
}
Modified: scummvm/trunk/engines/sword25/gfx/bitmapresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/bitmapresource.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -48,7 +48,7 @@
class BS_Rect;
-class BitmapResource : public BS_Resource {
+class BitmapResource : public Resource {
public:
/**
@brief Die m\xF6glichen Flippingparameter f\xFCr die Blit-Methode.
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -65,7 +65,7 @@
// -----------------------------------------------------------------------------
-DynamicBitmap::DynamicBitmap(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
+DynamicBitmap::DynamicBitmap(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
Bitmap(ParentPtr, TYPE_DYNAMICBITMAP, Handle) {
m_InitSuccess = Unpersist(Reader);
}
@@ -101,7 +101,7 @@
bool DynamicBitmap::DoRender() {
// Framebufferobjekt holen
- GraphicEngine *pGfx = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
+ GraphicEngine *pGfx = static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx"));
BS_ASSERT(pGfx);
// Bitmap zeichnen
@@ -157,7 +157,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool DynamicBitmap::Persist(BS_OutputPersistenceBlock &Writer) {
+bool DynamicBitmap::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
Result &= Bitmap::Persist(Writer);
@@ -171,7 +171,7 @@
return Result;
}
-bool DynamicBitmap::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool DynamicBitmap::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
Result &= Bitmap::Unpersist(Reader);
Modified: scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/dynamicbitmap.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -69,15 +69,15 @@
virtual bool IsColorModulationAllowed() const;
virtual bool IsSetContentAllowed() const;
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
protected:
virtual bool DoRender();
private:
DynamicBitmap(RenderObjectPtr<RenderObject> ParentPtr, unsigned int Width, unsigned int Height);
- DynamicBitmap(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
+ DynamicBitmap(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
bool CreateGLImage(unsigned int Width, unsigned int Height);
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -60,10 +60,10 @@
// Konstruktion / Destruktion
// -----------------------------------------------------------------------------
-FontResource::FontResource(BS_Kernel *pKernel, const Common::String &FileName) :
+FontResource::FontResource(Kernel *pKernel, const Common::String &FileName) :
_pKernel(pKernel),
_Valid(false),
- BS_Resource(FileName, BS_Resource::TYPE_FONT) {
+ Resource(FileName, Resource::TYPE_FONT) {
// XML Fontdatei parsen
TiXmlDocument Doc;
if (!_ParseXMLDocument(FileName, Doc)) {
Modified: scummvm/trunk/engines/sword25/gfx/fontresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -52,13 +52,13 @@
// Forward declarations
// -----------------------------------------------------------------------------
-class BS_Kernel;
+class Kernel;
// -----------------------------------------------------------------------------
// Klassendefinition
// -----------------------------------------------------------------------------
-class FontResource : public BS_Resource {
+class FontResource : public Resource {
public:
/**
@brief Erzeugt eine neues Exemplar von BS_FontResource
@@ -66,7 +66,7 @@
@param FileName der Dateiname der zu ladenen Resource
@remark Wenn der Konstruktor erfolgreich ausgef\xFChrt werden konnte gibt die Methode IsValid true zur\xFCck.
*/
- FontResource(BS_Kernel *pKernel, const Common::String &FileName);
+ FontResource(Kernel *pKernel, const Common::String &FileName);
/**
@brief Gibt true zur\xFCck, wenn das Objekt korrekt initialisiert wurde.
@@ -113,7 +113,7 @@
}
private:
- BS_Kernel *_pKernel;
+ Kernel *_pKernel;
bool _Valid;
Common::String _BitmapFileName;
int _LineHeight;
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -60,7 +60,7 @@
static const unsigned int FRAMETIME_SAMPLE_COUNT = 5; // Anzahl der Framezeiten \xFCber die, die Framezeit gemittelt wird
-GraphicEngine::GraphicEngine(BS_Kernel *pKernel) :
+GraphicEngine::GraphicEngine(Kernel *pKernel) :
m_Width(0),
m_Height(0),
m_BitDepth(0),
@@ -70,7 +70,7 @@
m_TimerActive(true),
m_FrameTimeSampleSlot(0),
m_RepaintedPixels(0),
- BS_ResourceService(pKernel) {
+ ResourceService(pKernel) {
m_FrameTimeSamples.resize(FRAMETIME_SAMPLE_COUNT);
if (!RegisterScriptBindings())
@@ -83,7 +83,7 @@
void GraphicEngine::UpdateLastFrameDuration() {
// Aktuelle Zeit holen
- uint64_t CurrentTime = BS_Kernel::GetInstance()->GetMicroTicks();
+ uint64_t CurrentTime = Kernel::GetInstance()->GetMicroTicks();
// Verstrichene Zeit seit letztem Frame berechnen und zu gro\xDFe Zeitspr\xFCnge ( > 250 msek.) unterbinden
// (kann vorkommen bei geladenen Spielst\xE4nden, w\xE4hrend des Debuggings oder Hardwareungenauigkeiten)
@@ -201,14 +201,14 @@
// -----------------------------------------------------------------------------
-bool GraphicEngine::Persist(BS_OutputPersistenceBlock &Writer) {
+bool GraphicEngine::Persist(OutputPersistenceBlock &Writer) {
Writer.Write(m_TimerActive);
return true;
}
// -----------------------------------------------------------------------------
-bool GraphicEngine::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool GraphicEngine::Unpersist(InputPersistenceBlock &Reader) {
Reader.Read(m_TimerActive);
return Reader.IsGood();
}
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -57,7 +57,7 @@
namespace Sword25 {
-class BS_Kernel;
+class Kernel;
class Image;
class Panel;
class Screenshot;
@@ -77,7 +77,7 @@
Die bisher einzige Implementation ist BS_DDrawGfx.
*/
-class GraphicEngine : public BS_ResourceService, public BS_Persistable {
+class GraphicEngine : public ResourceService, public Persistable {
public:
// Enums
// -----
@@ -358,8 +358,8 @@
// Persistence Methods
// -------------------
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
static void ARGBColorToLuaColor(lua_State *L, unsigned int Color);
static unsigned int LuaColorToARGBColor(lua_State *L, int StackIndex);
@@ -367,7 +367,7 @@
protected:
// Constructor
// -----------
- GraphicEngine(BS_Kernel *pKernel);
+ GraphicEngine(Kernel *pKernel);
// Display Variables
// -----------------
Modified: scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine_script.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -252,7 +252,7 @@
// -----------------------------------------------------------------------------
static GraphicEngine *GetGE() {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
GraphicEngine *pGE = static_cast<GraphicEngine *>(pKernel->GetService("gfx"));
BS_ASSERT(pGE);
@@ -1249,7 +1249,7 @@
// -----------------------------------------------------------------------------
static bool AnimationLoopPointCallback(unsigned int Handle) {
- lua_State *L = static_cast<lua_State *>(BS_Kernel::GetInstance()->GetScript()->GetScriptObject());
+ lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
LoopPointCallbackPtr->InvokeCallbackFunctions(L, Handle);
return true;
@@ -1287,7 +1287,7 @@
RenderObjectPtr<Animation> AnimationPtr(Handle);
if (AnimationPtr.IsValid()) {
ActionCallbackPtr->Action = AnimationPtr->GetCurrentAction();
- lua_State *L = static_cast<lua_State *>(BS_Kernel::GetInstance()->GetScript()->GetScriptObject());
+ lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
ActionCallbackPtr->InvokeCallbackFunctions(L, AnimationPtr->GetHandle());
}
@@ -1323,7 +1323,7 @@
// -----------------------------------------------------------------------------
static bool AnimationDeleteCallback(unsigned int Handle) {
- lua_State *L = static_cast<lua_State *>(BS_Kernel::GetInstance()->GetScript()->GetScriptObject());
+ lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
LoopPointCallbackPtr->RemoveAllObjectCallbacks(L, Handle);
return true;
@@ -1526,7 +1526,7 @@
// -----------------------------------------------------------------------------
bool GraphicEngine::RegisterScriptBindings() {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script"));
BS_ASSERT(pScript);
Modified: scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/opengl/glimage.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -57,10 +57,10 @@
m_Height(0) {
Result = false;
- PackageManager *pPackage = static_cast<PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
+ PackageManager *pPackage = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package"));
BS_ASSERT(pPackage);
- _backSurface = (static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx")))->getSurface();
+ _backSurface = (static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx")))->getSurface();
// Datei laden
char *pFileData;
Modified: scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -73,7 +73,7 @@
// CONSTRUCTION / DESTRUCTION
// -----------------------------------------------------------------------------
-OpenGLGfx::OpenGLGfx(BS_Kernel *pKernel) :
+OpenGLGfx::OpenGLGfx(Kernel *pKernel) :
GraphicEngine(pKernel),
m_GLspritesInitialized(false) {
}
@@ -86,7 +86,7 @@
// -----------------------------------------------------------------------------
-BS_Service *OpenGLGfx_CreateObject(BS_Kernel *pKernel) {
+Service *OpenGLGfx_CreateObject(Kernel *pKernel) {
return new OpenGLGfx(pKernel);
}
@@ -285,7 +285,7 @@
// RESOURCE MANAGING
// -----------------------------------------------------------------------------
-BS_Resource *OpenGLGfx::LoadResource(const Common::String &FileName) {
+Resource *OpenGLGfx::LoadResource(const Common::String &FileName) {
BS_ASSERT(CanLoadResource(FileName));
// Bild f\xFCr den Softwarebuffer laden
@@ -328,7 +328,7 @@
// Vectorgraphik laden
if (FileName.hasSuffix(SWF_EXTENSION)) {
// Pointer auf Package-Manager holen
- PackageManager *pPackage = BS_Kernel::GetInstance()->GetPackage();
+ PackageManager *pPackage = Kernel::GetInstance()->GetPackage();
BS_ASSERT(pPackage);
// Datei laden
@@ -371,7 +371,7 @@
// Font laden
if (FileName.hasSuffix(FNT_EXTENSION)) {
- FontResource *pResource = new FontResource(BS_Kernel::GetInstance(), FileName);
+ FontResource *pResource = new FontResource(Kernel::GetInstance(), FileName);
if (pResource->IsValid())
return pResource;
else {
@@ -407,7 +407,7 @@
// PERSISTENZ
// -----------------------------------------------------------------------------
-bool OpenGLGfx::Persist(BS_OutputPersistenceBlock &Writer) {
+bool OpenGLGfx::Persist(OutputPersistenceBlock &Writer) {
bool result = true;
result &= GraphicEngine::Persist(Writer);
@@ -418,7 +418,7 @@
// -----------------------------------------------------------------------------
-bool OpenGLGfx::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool OpenGLGfx::Unpersist(InputPersistenceBlock &Reader) {
bool result = true;
result &= GraphicEngine::Unpersist(Reader);
Modified: scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/opengl/openglgfx.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -49,9 +49,9 @@
// FORWARD DECLARATIONS
// -----------------------------------------------------------------------------
-class BS_Kernel;
-class BS_Service;
-class BS_Resource;
+class Kernel;
+class Service;
+class Resource;
class Panel;
class BS_Image;
class RenderObjectManager;
@@ -63,7 +63,7 @@
class OpenGLGfx : public GraphicEngine {
public:
- OpenGLGfx(BS_Kernel *pKernel);
+ OpenGLGfx(Kernel *pKernel);
virtual ~OpenGLGfx();
// Interface
@@ -82,7 +82,7 @@
// Resource-Managing Methoden
// --------------------------
- virtual BS_Resource *LoadResource(const Common::String &FileName);
+ virtual Resource *LoadResource(const Common::String &FileName);
virtual bool CanLoadResource(const Common::String &FileName);
// Debugging Methoden
@@ -91,8 +91,8 @@
// Persistenz Methoden
// -------------------
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
private:
bool m_GLspritesInitialized;
Modified: scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/opengl/swimage.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -56,7 +56,7 @@
m_Height(0) {
Result = false;
- PackageManager *pPackage = static_cast<PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
+ PackageManager *pPackage = static_cast<PackageManager *>(Kernel::GetInstance()->GetService("package"));
BS_ASSERT(pPackage);
// Datei laden
Modified: scummvm/trunk/engines/sword25/gfx/panel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/panel.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -76,7 +76,7 @@
// -----------------------------------------------------------------------------
-Panel::Panel(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
+Panel::Panel(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
RenderObject(ParentPtr, RenderObject::TYPE_PANEL, Handle) {
m_InitSuccess = Unpersist(Reader);
}
@@ -94,7 +94,7 @@
// Falls der Alphawert 0 ist, ist das Panel komplett durchsichtig und es muss nichts gezeichnet werden.
if (m_Color >> 24 == 0) return true;
- GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
+ GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx"));
BS_ASSERT(GfxPtr);
return GfxPtr->Fill(&m_BBox, m_Color);
@@ -104,7 +104,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool Panel::Persist(BS_OutputPersistenceBlock &Writer) {
+bool Panel::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
Result &= RenderObject::Persist(Writer);
@@ -117,7 +117,7 @@
// -----------------------------------------------------------------------------
-bool Panel::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool Panel::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
Result &= RenderObject::Unpersist(Reader);
Modified: scummvm/trunk/engines/sword25/gfx/panel.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/panel.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -53,7 +53,7 @@
private:
Panel(RenderObjectPtr<RenderObject> ParentPtr, int Width, int Height, unsigned int Color);
- Panel(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
+ Panel(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
public:
virtual ~Panel();
@@ -66,8 +66,8 @@
ForceRefresh();
}
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
protected:
virtual bool DoRender();
Modified: scummvm/trunk/engines/sword25/gfx/renderobject.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -383,7 +383,7 @@
// Persistenz-Methoden
// -------------------
-bool RenderObject::Persist(BS_OutputPersistenceBlock &Writer) {
+bool RenderObject::Persist(OutputPersistenceBlock &Writer) {
// Typ und Handle werden als erstes gespeichert, damit beim Laden ein Objekt vom richtigen Typ mit dem richtigen Handle erzeugt werden kann.
Writer.Write(static_cast<unsigned int>(m_Type));
Writer.Write(m_Handle);
@@ -419,7 +419,7 @@
// -----------------------------------------------------------------------------
-bool RenderObject::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool RenderObject::Unpersist(InputPersistenceBlock &Reader) {
// Typ und Handle wurden schon von RecreatePersistedRenderObject() ausgelesen. Jetzt werden die restlichen Objekteigenschaften ausgelesen.
Reader.Read(m_X);
Reader.Read(m_Y);
@@ -456,7 +456,7 @@
// -----------------------------------------------------------------------------
-bool RenderObject::PersistChildren(BS_OutputPersistenceBlock &Writer) {
+bool RenderObject::PersistChildren(OutputPersistenceBlock &Writer) {
bool Result = true;
// Kinderanzahl speichern.
@@ -474,7 +474,7 @@
// -----------------------------------------------------------------------------
-bool RenderObject::UnpersistChildren(BS_InputPersistenceBlock &Reader) {
+bool RenderObject::UnpersistChildren(InputPersistenceBlock &Reader) {
bool Result = true;
// Kinderanzahl einlesen.
@@ -492,7 +492,7 @@
// -----------------------------------------------------------------------------
-RenderObjectPtr<RenderObject> RenderObject::RecreatePersistedRenderObject(BS_InputPersistenceBlock &Reader) {
+RenderObjectPtr<RenderObject> RenderObject::RecreatePersistedRenderObject(InputPersistenceBlock &Reader) {
RenderObjectPtr<RenderObject> Result;
// Typ und Handle auslesen.
Modified: scummvm/trunk/engines/sword25/gfx/renderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/renderobject.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -59,7 +59,7 @@
// Forward Declarations
// -----------------------------------------------------------------------------
-class BS_Kernel;
+class Kernel;
class RenderObjectManager;
class Bitmap;
class Animation;
@@ -354,13 +354,13 @@
// Persistenz-Methoden
// -------------------
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
// TODO: Evtl. protected
- bool PersistChildren(BS_OutputPersistenceBlock &Writer);
- bool UnpersistChildren(BS_InputPersistenceBlock &Reader);
+ bool PersistChildren(OutputPersistenceBlock &Writer);
+ bool UnpersistChildren(InputPersistenceBlock &Reader);
// TODO: Evtl. private
- RenderObjectPtr<RenderObject> RecreatePersistedRenderObject(BS_InputPersistenceBlock &Reader);
+ RenderObjectPtr<RenderObject> RecreatePersistedRenderObject(InputPersistenceBlock &Reader);
protected:
// Typen
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -77,7 +77,7 @@
m_FrameStarted = true;
// Verstrichene Zeit bestimmen
- int TimeElapsed = BS_Kernel::GetInstance()->GetGfx()->GetLastFrameDurationMicro();
+ int TimeElapsed = Kernel::GetInstance()->GetGfx()->GetLastFrameDurationMicro();
// Alle BS_TimedRenderObject Objekte \xFCber den Framestart und die verstrichene Zeit in Kenntnis setzen
RenderObjectList::iterator Iter = m_TimedRenderObjects.begin();
@@ -119,7 +119,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool RenderObjectManager::Persist(BS_OutputPersistenceBlock &Writer) {
+bool RenderObjectManager::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
// Alle Kinder des Wurzelknotens speichern. Dadurch werden alle BS_RenderObjects gespeichert rekursiv gespeichert.
@@ -143,7 +143,7 @@
// -----------------------------------------------------------------------------
-bool RenderObjectManager::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool RenderObjectManager::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
// Alle Kinder des Wurzelknotens l\xF6schen. Damit werden alle BS_RenderObjects gel\xF6scht.
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectmanager.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -57,7 +57,7 @@
namespace Sword25 {
// Klassendefinition
-class BS_Kernel;
+class Kernel;
class BS_Rect;
class RenderObject;
class TimedRenderObject;
@@ -68,7 +68,7 @@
Sie sorgt daf\xFCr, dass die BS_RenderObjects in der richtigen Reihenfolge gerendert werden und erm\xF6glicht den Zugriff auf die
BS_RenderObjects \xFCber einen String.
*/
-class RenderObjectManager : public BS_Persistable {
+class RenderObjectManager : public Persistable {
public:
/**
@brief Erzeugt ein neues BS_RenderObjectManager-Objekt.
@@ -115,8 +115,8 @@
*/
void DetatchTimedRenderObject(RenderObjectPtr<TimedRenderObject> pRenderObject);
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
private:
bool m_FrameStarted;
Modified: scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/renderobjectregistry.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -58,7 +58,7 @@
// Klassendeklaration
// -----------------------------------------------------------------------------
-class RenderObjectRegistry : public BS_ObjectRegistry<RenderObject> {
+class RenderObjectRegistry : public ObjectRegistry<RenderObject> {
public:
static RenderObjectRegistry &GetInstance() {
if (!m_InstancePtr.get()) m_InstancePtr.reset(new RenderObjectRegistry);
Modified: scummvm/trunk/engines/sword25/gfx/rootrenderobject.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/rootrenderobject.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/rootrenderobject.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -45,7 +45,7 @@
// Forward Declarations
// -----------------------------------------------------------------------------
-class BS_Kernel;
+class Kernel;
// Klassendefinition
class RenderObjectManager;
Modified: scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/staticbitmap.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -64,7 +64,7 @@
// -----------------------------------------------------------------------------
-StaticBitmap::StaticBitmap(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
+StaticBitmap::StaticBitmap(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
Bitmap(ParentPtr, TYPE_STATICBITMAP, Handle) {
m_InitSuccess = Unpersist(Reader);
}
@@ -73,12 +73,12 @@
bool StaticBitmap::InitBitmapResource(const Common::String &Filename) {
// Bild-Resource laden
- BS_Resource *ResourcePtr = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(Filename);
+ Resource *ResourcePtr = Kernel::GetInstance()->GetResourceManager()->RequestResource(Filename);
if (!ResourcePtr) {
BS_LOG_ERRORLN("Could not request resource \"%s\".", Filename.c_str());
return false;
}
- if (ResourcePtr->GetType() != BS_Resource::TYPE_BITMAP) {
+ if (ResourcePtr->GetType() != Resource::TYPE_BITMAP) {
BS_LOG_ERRORLN("Requested resource \"%s\" is not a bitmap.", Filename.c_str());
return false;
}
@@ -107,13 +107,13 @@
bool StaticBitmap::DoRender() {
// Bitmap holen
- BS_Resource *ResourcePtr = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
+ Resource *ResourcePtr = Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
BS_ASSERT(ResourcePtr);
- BS_ASSERT(ResourcePtr->GetType() == BS_Resource::TYPE_BITMAP);
+ BS_ASSERT(ResourcePtr->GetType() == Resource::TYPE_BITMAP);
BitmapResource *BitmapResourcePtr = static_cast<BitmapResource *>(ResourcePtr);
// Framebufferobjekt holen
- GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
+ GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx"));
BS_ASSERT(GfxPtr);
// Bitmap zeichnen
@@ -142,8 +142,8 @@
BS_ASSERT(X >= 0 && X < m_Width);
BS_ASSERT(Y >= 0 && Y < m_Height);
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
BitmapResource *pBitmapResource = static_cast<BitmapResource *>(pResource);
unsigned int Result = pBitmapResource->GetPixel(X, Y);
pResource->Release();
@@ -162,8 +162,8 @@
// -----------------------------------------------------------------------------
bool StaticBitmap::IsAlphaAllowed() const {
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
bool Result = static_cast<BitmapResource *>(pResource)->IsAlphaAllowed();
pResource->Release();
return Result;
@@ -172,8 +172,8 @@
// -----------------------------------------------------------------------------
bool StaticBitmap::IsColorModulationAllowed() const {
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
bool Result = static_cast<BitmapResource *>(pResource)->IsColorModulationAllowed();
pResource->Release();
return Result;
@@ -182,8 +182,8 @@
// -----------------------------------------------------------------------------
bool StaticBitmap::IsScalingAllowed() const {
- BS_Resource *pResource = BS_Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
- BS_ASSERT(pResource->GetType() == BS_Resource::TYPE_BITMAP);
+ Resource *pResource = Kernel::GetInstance()->GetResourceManager()->RequestResource(m_ResourceFilename);
+ BS_ASSERT(pResource->GetType() == Resource::TYPE_BITMAP);
bool Result = static_cast<BitmapResource *>(pResource)->IsScalingAllowed();
pResource->Release();
return Result;
@@ -193,7 +193,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool StaticBitmap::Persist(BS_OutputPersistenceBlock &Writer) {
+bool StaticBitmap::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
Result &= Bitmap::Persist(Writer);
@@ -204,7 +204,7 @@
return Result;
}
-bool StaticBitmap::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool StaticBitmap::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
Result &= Bitmap::Unpersist(Reader);
Modified: scummvm/trunk/engines/sword25/gfx/staticbitmap.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/staticbitmap.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -56,7 +56,7 @@
@remark Filename muss absoluter Pfad sein
*/
StaticBitmap(RenderObjectPtr<RenderObject> ParentPtr, const Common::String &Filename);
- StaticBitmap(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
+ StaticBitmap(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
public:
virtual ~StaticBitmap();
@@ -72,8 +72,8 @@
return false;
}
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
protected:
virtual bool DoRender();
Modified: scummvm/trunk/engines/sword25/gfx/text.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/text.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -74,7 +74,7 @@
// -----------------------------------------------------------------------------
-Text::Text(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
+Text::Text(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle) :
RenderObject(ParentPtr, TYPE_TEXT, Handle) {
m_InitSuccess = Unpersist(Reader);
}
@@ -152,15 +152,15 @@
if (!FontPtr) return false;
// Charactermap-Resource locken.
- BS_ResourceManager *RMPtr = GetResourceManager();
+ ResourceManager *RMPtr = GetResourceManager();
BitmapResource *CharMapPtr;
{
- BS_Resource *pResource = RMPtr->RequestResource(FontPtr->GetCharactermapFileName());
+ Resource *pResource = RMPtr->RequestResource(FontPtr->GetCharactermapFileName());
if (!pResource) {
BS_LOG_ERRORLN("Could not request resource \"%s\".", FontPtr->GetCharactermapFileName().c_str());
return false;
}
- if (pResource->GetType() != BS_Resource::TYPE_BITMAP) {
+ if (pResource->GetType() != Resource::TYPE_BITMAP) {
BS_LOG_ERRORLN("Requested resource \"%s\" is not a bitmap.", FontPtr->GetCharactermapFileName().c_str());
return false;
}
@@ -169,7 +169,7 @@
}
// Framebufferobjekt holen.
- GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(BS_Kernel::GetInstance()->GetService("gfx"));
+ GraphicEngine *GfxPtr = static_cast<GraphicEngine *>(Kernel::GetInstance()->GetService("gfx"));
BS_ASSERT(GfxPtr);
bool Result = true;
@@ -207,25 +207,25 @@
// -----------------------------------------------------------------------------
-BS_ResourceManager *Text::GetResourceManager() {
+ResourceManager *Text::GetResourceManager() {
// Pointer auf den Resource-Manager holen.
- return BS_Kernel::GetInstance()->GetResourceManager();
+ return Kernel::GetInstance()->GetResourceManager();
}
// -----------------------------------------------------------------------------
FontResource *Text::LockFontResource() {
- BS_ResourceManager *RMPtr = GetResourceManager();
+ ResourceManager *RMPtr = GetResourceManager();
// Font-Resource locken.
FontResource *FontPtr;
{
- BS_Resource *ResourcePtr = RMPtr->RequestResource(m_Font);
+ Resource *ResourcePtr = RMPtr->RequestResource(m_Font);
if (!ResourcePtr) {
BS_LOG_ERRORLN("Could not request resource \"%s\".", m_Font.c_str());
return NULL;
}
- if (ResourcePtr->GetType() != BS_Resource::TYPE_FONT) {
+ if (ResourcePtr->GetType() != Resource::TYPE_FONT) {
BS_LOG_ERRORLN("Requested resource \"%s\" is not a font.", m_Font.c_str());
return NULL;
}
@@ -333,7 +333,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool Text::Persist(BS_OutputPersistenceBlock &Writer) {
+bool Text::Persist(OutputPersistenceBlock &Writer) {
bool Result = true;
Result &= RenderObject::Persist(Writer);
@@ -349,7 +349,7 @@
return Result;
}
-bool Text::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool Text::Unpersist(InputPersistenceBlock &Reader) {
bool Result = true;
Result &= RenderObject::Unpersist(Reader);
Modified: scummvm/trunk/engines/sword25/gfx/text.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/gfx/text.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -53,9 +53,9 @@
// Forward Declarations
// -----------------------------------------------------------------------------
-class BS_Kernel;
+class Kernel;
class FontResource;
-class BS_ResourceManager;
+class ResourceManager;
// -----------------------------------------------------------------------------
// Klassendefinition
@@ -151,15 +151,15 @@
return m_AutoWrapThreshold;
}
- virtual bool Persist(BS_OutputPersistenceBlock &Writer);
- virtual bool Unpersist(BS_InputPersistenceBlock &Reader);
+ virtual bool Persist(OutputPersistenceBlock &Writer);
+ virtual bool Unpersist(InputPersistenceBlock &Reader);
protected:
virtual bool DoRender();
private:
Text(RenderObjectPtr<RenderObject> ParentPtr);
- Text(BS_InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
+ Text(InputPersistenceBlock &Reader, RenderObjectPtr<RenderObject> ParentPtr, unsigned int Handle);
unsigned int m_ModulationColor;
Common::String m_Font;
@@ -176,7 +176,7 @@
void UpdateFormat();
void UpdateMetrics(FontResource &FontResource);
- BS_ResourceManager *GetResourceManager();
+ ResourceManager *GetResourceManager();
FontResource *LockFontResource();
};
Modified: scummvm/trunk/engines/sword25/input/inputengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/input/inputengine.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/input/inputengine.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -44,7 +44,7 @@
namespace Sword25 {
-InputEngine::InputEngine(BS_Kernel *pKernel) : BS_Service(pKernel) {
+InputEngine::InputEngine(Kernel *pKernel) : Service(pKernel) {
if (!_RegisterScriptBindings())
BS_LOG_ERRORLN("Script bindings could not be registered.");
else
Modified: scummvm/trunk/engines/sword25/input/inputengine.h
===================================================================
--- scummvm/trunk/engines/sword25/input/inputengine.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/input/inputengine.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -55,9 +55,9 @@
/// Class definitions
-class InputEngine : public BS_Service, public BS_Persistable {
+class InputEngine : public Service, public Persistable {
public:
- InputEngine(BS_Kernel *pKernel);
+ InputEngine(Kernel *pKernel);
virtual ~InputEngine() {};
// NOTE: These codes are registered in inputengine_script.cpp
Modified: scummvm/trunk/engines/sword25/input/inputengine_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/input/inputengine_script.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/input/inputengine_script.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -107,7 +107,7 @@
// -----------------------------------------------------------------------------
static InputEngine *GetIE() {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
InputEngine *pIE = static_cast<InputEngine *>(pKernel->GetService("input"));
BS_ASSERT(pIE);
@@ -245,7 +245,7 @@
static void TheCharacterCallback(int Character) {
CharacterCallbackPtr->Character = static_cast<unsigned char>(Character);
- lua_State *L = static_cast<lua_State *>(BS_Kernel::GetInstance()->GetScript()->GetScriptObject());
+ lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
CharacterCallbackPtr->InvokeCallbackFunctions(L, 1);
}
@@ -271,7 +271,7 @@
static void TheCommandCallback(int Command) {
CommandCallbackPtr->Command = static_cast<InputEngine::KEY_COMMANDS>(Command);
- lua_State *L = static_cast<lua_State *>(BS_Kernel::GetInstance()->GetScript()->GetScriptObject());
+ lua_State *L = static_cast<lua_State *>(Kernel::GetInstance()->GetScript()->GetScriptObject());
CommandCallbackPtr->InvokeCallbackFunctions(L, 1);
}
@@ -336,7 +336,7 @@
// -----------------------------------------------------------------------------
bool InputEngine::_RegisterScriptBindings() {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
ScriptEngine *pScript = static_cast<ScriptEngine *>(pKernel->GetService("script"));
BS_ASSERT(pScript);
Modified: scummvm/trunk/engines/sword25/input/scummvminput.cpp
===================================================================
--- scummvm/trunk/engines/sword25/input/scummvminput.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/input/scummvminput.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -53,7 +53,7 @@
// Constructor / Destructor
// -----------------------------------------------------------------------------
-ScummVMInput::ScummVMInput(BS_Kernel *pKernel) :
+ScummVMInput::ScummVMInput(Kernel *pKernel) :
m_CurrentState(0),
m_LeftMouseDown(false),
m_RightMouseDown(false),
@@ -80,7 +80,7 @@
// -----------------------------------------------------------------------------
-BS_Service *ScummVMInput_CreateObject(BS_Kernel *pKernel) {
+Service *ScummVMInput_CreateObject(Kernel *pKernel) {
return new ScummVMInput(pKernel);
}
@@ -127,7 +127,7 @@
break;
case Common::EVENT_QUIT:
- BS_Kernel::GetInstance()->GetWindow()->SetWindowAlive(false);
+ Kernel::GetInstance()->GetWindow()->SetWindowAlive(false);
break;
default:
@@ -161,7 +161,7 @@
// Only bother checking for a double click if the left mouse button was clicked
if (WasLeftMouseDown()) {
// Get the time now
- unsigned int Now = BS_Kernel::GetInstance()->GetMilliTicks();
+ unsigned int Now = Kernel::GetInstance()->GetMilliTicks();
// A double click is signalled if
// 1. The two clicks are close enough together
@@ -335,7 +335,7 @@
// Persistenz
// -----------------------------------------------------------------------------
-bool ScummVMInput::Persist(BS_OutputPersistenceBlock &Writer) {
+bool ScummVMInput::Persist(OutputPersistenceBlock &Writer) {
// Anzahl an Command-Callbacks persistieren.
Writer.Write(m_CommandCallbacks.size());
@@ -365,7 +365,7 @@
// -----------------------------------------------------------------------------
-bool ScummVMInput::Unpersist(BS_InputPersistenceBlock &Reader) {
+bool ScummVMInput::Unpersist(InputPersistenceBlock &Reader) {
// Command-Callbackliste leeren.
m_CommandCallbacks.clear();
Modified: scummvm/trunk/engines/sword25/input/scummvminput.h
===================================================================
--- scummvm/trunk/engines/sword25/input/scummvminput.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/input/scummvminput.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -44,12 +44,12 @@
namespace Sword25 {
/// Forward class definitions
-class BS_Kernel;
+class Kernel;
/// Class definitions
class ScummVMInput : public InputEngine {
public:
- ScummVMInput(BS_Kernel *pKernel);
+ ScummVMInput(Kernel *pKernel);
virtual ~ScummVMInput();
virtual bool Init();
@@ -72,8 +72,8 @@
virtual void ReportCharacter(unsigned char Character);
virtual void ReportCommand(KEY_COMMANDS Command);
- bool Persist(BS_OutputPersistenceBlock &Writer);
- bool Unpersist(BS_InputPersistenceBlock &Reader);
+ bool Persist(OutputPersistenceBlock &Writer);
+ bool Unpersist(InputPersistenceBlock &Reader);
private:
void TestForLeftDoubleClick();
Modified: scummvm/trunk/engines/sword25/kernel/filesystemutil.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/filesystemutil.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/kernel/filesystemutil.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -68,7 +68,7 @@
// Class definitions
// -----------------------------------------------------------------------------
-class BS_FileSystemUtilScummVM : public BS_FileSystemUtil {
+class BS_FileSystemUtilScummVM : public FileSystemUtil {
public:
virtual Common::String GetUserdataDirectory() {
Common::String path = ConfMan.get("savepath");
@@ -134,7 +134,7 @@
// Singleton method of parent class
// -----------------------------------------------------------------------------
-BS_FileSystemUtil &BS_FileSystemUtil::GetInstance() {
+FileSystemUtil &FileSystemUtil::GetInstance() {
static BS_FileSystemUtilScummVM Instance;
return Instance;
}
Modified: scummvm/trunk/engines/sword25/kernel/filesystemutil.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/filesystemutil.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/kernel/filesystemutil.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -60,10 +60,10 @@
// Class definitions
// -----------------------------------------------------------------------------
-class BS_FileSystemUtil {
+class FileSystemUtil {
public:
- static BS_FileSystemUtil &GetInstance();
- virtual ~BS_FileSystemUtil() {};
+ static FileSystemUtil &GetInstance();
+ virtual ~FileSystemUtil() {};
/**
* This function returns the name of the directory in which all user data is to be stored.
Modified: scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -46,7 +46,7 @@
// Constructor / Destructor
// -----------------------------------------------------------------------------
-BS_InputPersistenceBlock::BS_InputPersistenceBlock(const void *Data, unsigned int DataLength) :
+InputPersistenceBlock::InputPersistenceBlock(const void *Data, unsigned int DataLength) :
m_Data(static_cast<const unsigned char *>(Data), DataLength),
m_ErrorState(NONE) {
m_Iter = m_Data.begin();
@@ -54,7 +54,7 @@
// -----------------------------------------------------------------------------
-BS_InputPersistenceBlock::~BS_InputPersistenceBlock() {
+InputPersistenceBlock::~InputPersistenceBlock() {
if (m_Iter != m_Data.end()) BS_LOG_WARNINGLN("Persistence block was not read to the end.");
}
@@ -62,7 +62,7 @@
// Reading
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::Read(int16 &Value) {
+void InputPersistenceBlock::Read(int16 &Value) {
signed int v;
Read(v);
Value = static_cast<int16>(v);
@@ -70,7 +70,7 @@
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::Read(signed int &Value) {
+void InputPersistenceBlock::Read(signed int &Value) {
if (CheckMarker(SINT_MARKER)) {
RawRead(&Value, sizeof(signed int));
Value = ConvertEndianessFromStorageToSystem(Value);
@@ -81,7 +81,7 @@
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::Read(unsigned int &Value) {
+void InputPersistenceBlock::Read(unsigned int &Value) {
if (CheckMarker(UINT_MARKER)) {
RawRead(&Value, sizeof(unsigned int));
Value = ConvertEndianessFromStorageToSystem(Value);
@@ -92,7 +92,7 @@
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::Read(float &Value) {
+void InputPersistenceBlock::Read(float &Value) {
if (CheckMarker(FLOAT_MARKER)) {
RawRead(&Value, sizeof(float));
Value = ConvertEndianessFromStorageToSystem(Value);
@@ -103,7 +103,7 @@
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::Read(bool &Value) {
+void InputPersistenceBlock::Read(bool &Value) {
if (CheckMarker(BOOL_MARKER)) {
unsigned int UIntBool;
RawRead(&UIntBool, sizeof(float));
@@ -116,7 +116,7 @@
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::Read(Common::String &Value) {
+void InputPersistenceBlock::Read(Common::String &Value) {
Value = "";
if (CheckMarker(STRING_MARKER)) {
@@ -132,7 +132,7 @@
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::Read(Common::Array<unsigned char> &Value) {
+void InputPersistenceBlock::Read(Common::Array<unsigned char> &Value) {
if (CheckMarker(BLOCK_MARKER)) {
unsigned int Size;
Read(Size);
@@ -146,7 +146,7 @@
// -----------------------------------------------------------------------------
-void BS_InputPersistenceBlock::RawRead(void *DestPtr, size_t Size) {
+void InputPersistenceBlock::RawRead(void *DestPtr, size_t Size) {
if (CheckBlockSize(Size)) {
memcpy(DestPtr, &*m_Iter, Size);
m_Iter += Size;
@@ -155,7 +155,7 @@
// -----------------------------------------------------------------------------
-bool BS_InputPersistenceBlock::CheckBlockSize(int Size) {
+bool InputPersistenceBlock::CheckBlockSize(int Size) {
if (m_Data.end() - m_Iter >= Size) {
return true;
} else {
@@ -167,7 +167,7 @@
// -----------------------------------------------------------------------------
-bool BS_InputPersistenceBlock::CheckMarker(unsigned char Marker) {
+bool InputPersistenceBlock::CheckMarker(unsigned char Marker) {
if (!IsGood() || !CheckBlockSize(1)) return false;
if (*m_Iter++ == Marker) {
Modified: scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/kernel/inputpersistenceblock.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -49,7 +49,7 @@
// Class declaration
// -----------------------------------------------------------------------------
-class BS_InputPersistenceBlock : public BS_PersistenceBlock {
+class InputPersistenceBlock : public PersistenceBlock {
public:
enum ErrorState {
NONE,
@@ -57,8 +57,8 @@
OUT_OF_SYNC
};
- BS_InputPersistenceBlock(const void *Data, unsigned int DataLength);
- virtual ~BS_InputPersistenceBlock();
+ InputPersistenceBlock(const void *Data, unsigned int DataLength);
+ virtual ~InputPersistenceBlock();
void Read(int16 &Value);
void Read(signed int &Value);
Modified: scummvm/trunk/engines/sword25/kernel/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/kernel/kernel.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -47,9 +47,9 @@
#define BS_LOG_PREFIX "KERNEL"
-BS_Kernel *BS_Kernel::_Instance = 0;
+Kernel *Kernel::_Instance = 0;
-BS_Kernel::BS_Kernel() :
+Kernel::Kernel() :
_pWindow(NULL),
_Running(false),
_pResourceManager(NULL),
@@ -75,14 +75,14 @@
}
// Create window object
- _pWindow = BS_Window::CreateBSWindow(0, 0, 0, 0, false);
+ _pWindow = Window::CreateBSWindow(0, 0, 0, 0, false);
if (!_pWindow) {
BS_LOG_ERRORLN("Failed to create the window.");
} else
BS_LOGLN("Window created.");
// Create the resource manager
- _pResourceManager = new BS_ResourceManager(this);
+ _pResourceManager = new ResourceManager(this);
// Initialise the script engine
ScriptEngine *pScript = static_cast<ScriptEngine *>(NewService("script", "lua"));
@@ -102,7 +102,7 @@
_InitSuccess = true;
}
-BS_Kernel::~BS_Kernel() {
+Kernel::~Kernel() {
// Services are de-registered in reverse order of creation
while (!_ServiceCreationOrder.empty()) {
Superclass *superclass = GetSuperclassByIdentifier(_ServiceCreationOrder.top());
@@ -129,7 +129,7 @@
// Service Methoden
// ----------------
-BS_Kernel::Superclass::Superclass(BS_Kernel *pKernel, const Common::String &Identifier) :
+Kernel::Superclass::Superclass(Kernel *pKernel, const Common::String &Identifier) :
_pKernel(pKernel),
_Identifier(Identifier),
_ServiceCount(0),
@@ -139,7 +139,7 @@
_ServiceCount++;
}
-BS_Kernel::Superclass::~Superclass() {
+Kernel::Superclass::~Superclass() {
DisconnectService();
}
@@ -152,7 +152,7 @@
* Hierbei ist zu beachten, dass der erste Service die Nummer 0 erh\xE4lt. Number muss also eine Zahl zwischen
* 0 und GetServiceCount() - 1 sein.
*/
-Common::String BS_Kernel::Superclass::GetServiceIdentifier(unsigned int Number) {
+Common::String Kernel::Superclass::GetServiceIdentifier(unsigned int Number) {
if (Number > _ServiceCount) return NULL;
unsigned int CurServiceOrd = 0;
@@ -177,11 +177,11 @@
* @param ServiceIdentifier The name of the service
* For the superclass "sfx" an example could be "Fmod" or "directsound"
*/
-BS_Service *BS_Kernel::Superclass::NewService(const Common::String &ServiceIdentifier) {
+Service *Kernel::Superclass::NewService(const Common::String &ServiceIdentifier) {
for (unsigned int i = 0; i < BS_SERVICE_COUNT; i++)
if (BS_SERVICE_TABLE[i].SuperclassIdentifier == _Identifier &&
BS_SERVICE_TABLE[i].ServiceIdentifier == ServiceIdentifier) {
- BS_Service *NewService_ = BS_SERVICE_TABLE[i].CreateMethod(_pKernel);
+ Service *NewService_ = BS_SERVICE_TABLE[i].CreateMethod(_pKernel);
if (NewService_) {
DisconnectService();
@@ -205,7 +205,7 @@
* @param SuperclassIdentfier The name of the superclass which is to be disconnected
* z.B: "sfx", "gfx", "package" ...
*/
-bool BS_Kernel::Superclass::DisconnectService() {
+bool Kernel::Superclass::DisconnectService() {
if (_ActiveService) {
delete _ActiveService;
_ActiveService = 0;
@@ -216,7 +216,7 @@
return false;
}
-BS_Kernel::Superclass *BS_Kernel::GetSuperclassByIdentifier(const Common::String &Identifier) {
+Kernel::Superclass *Kernel::GetSuperclassByIdentifier(const Common::String &Identifier) {
Common::Array<Superclass *>::iterator Iter;
for (Iter = _SuperclassList.begin(); Iter != _SuperclassList.end(); ++Iter) {
if ((*Iter)->GetIdentifier() == Identifier)
@@ -230,7 +230,7 @@
/**
* Returns the number of register superclasses
*/
-unsigned int BS_Kernel::GetSuperclassCount() {
+unsigned int Kernel::GetSuperclassCount() {
return _SuperclassList.size();
}
@@ -240,7 +240,7 @@
* @param Number The number of the superclass to return the identifier for.
* It should be noted that the number should be between 0 und GetSuperclassCount() - 1.
*/
-Common::String BS_Kernel::GetSuperclassIdentifier(unsigned int Number) {
+Common::String Kernel::GetSuperclassIdentifier(unsigned int Number) {
if (Number > _SuperclassList.size()) return NULL;
unsigned int CurSuperclassOrd = 0;
@@ -260,7 +260,7 @@
* @param SuperclassIdentifier The name of the superclass
* z.B: "sfx", "gfx", "package" ...
*/
-unsigned int BS_Kernel::GetServiceCount(const Common::String &SuperclassIdentifier) {
+unsigned int Kernel::GetServiceCount(const Common::String &SuperclassIdentifier) {
Superclass *pSuperclass;
if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier)))
return 0;
@@ -278,7 +278,7 @@
* Hierbei ist zu beachten, dass der erste Service die Nummer 0 erh\xE4lt. Number muss also eine Zahl zwischen
* 0 und GetServiceCount() - 1 sein.
*/
-Common::String BS_Kernel::GetServiceIdentifier(const Common::String &SuperclassIdentifier, unsigned int Number) {
+Common::String Kernel::GetServiceIdentifier(const Common::String &SuperclassIdentifier, unsigned int Number) {
Superclass *pSuperclass;
if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return NULL;
@@ -294,7 +294,7 @@
* @param ServiceIdentifier The name of the service
* For the superclass "sfx" an example could be "Fmod" or "directsound"
*/
-BS_Service *BS_Kernel::NewService(const Common::String &SuperclassIdentifier, const Common::String &ServiceIdentifier) {
+Service *Kernel::NewService(const Common::String &SuperclassIdentifier, const Common::String &ServiceIdentifier) {
Superclass *pSuperclass;
if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return NULL;
@@ -310,7 +310,7 @@
* @param SuperclassIdentfier The name of the superclass which is to be disconnected
* z.B: "sfx", "gfx", "package" ...
*/
-bool BS_Kernel::DisconnectService(const Common::String &SuperclassIdentifier) {
+bool Kernel::DisconnectService(const Common::String &SuperclassIdentifier) {
Superclass *pSuperclass;
if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return false;
@@ -322,7 +322,7 @@
* @param SuperclassIdentfier The name of the superclass
* z.B: "sfx", "gfx", "package" ...
*/
-BS_Service *BS_Kernel::GetService(const Common::String &SuperclassIdentifier) {
+Service *Kernel::GetService(const Common::String &SuperclassIdentifier) {
Superclass *pSuperclass;
if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return NULL;
@@ -335,7 +335,7 @@
* @param SuperclassIdentfier The name of the superclass
* z.B: "sfx", "gfx", "package" ...
*/
-Common::String BS_Kernel::GetActiveServiceIdentifier(const Common::String &SuperclassIdentifier) {
+Common::String Kernel::GetActiveServiceIdentifier(const Common::String &SuperclassIdentifier) {
Superclass *pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier);
if (!pSuperclass) return Common::String("");
@@ -349,7 +349,7 @@
* @param Min The minimum allowed value
* @param Max The maximum allowed value
*/
-int BS_Kernel::GetRandomNumber(int Min, int Max) {
+int Kernel::GetRandomNumber(int Min, int Max) {
BS_ASSERT(Min <= Max);
return Min + _rnd.getRandomNumber(Max - Min + 1);
@@ -358,7 +358,7 @@
/**
* Returns the elapsed time since startup in milliseconds
*/
-unsigned int BS_Kernel::GetMilliTicks() {
+unsigned int Kernel::GetMilliTicks() {
return g_system->getMillis();
}
@@ -366,7 +366,7 @@
* Returns the elapsed time since the system start in microseconds.
* This method should be used only if GetMilliTick() for the desired application is inaccurate.
*/
-uint64 BS_Kernel::GetMicroTicks() {
+uint64 Kernel::GetMicroTicks() {
return g_system->getMillis() * 1000;
}
@@ -376,7 +376,7 @@
/**
* Returns how much memory is being used
*/
-size_t BS_Kernel::GetUsedMemory() {
+size_t Kernel::GetUsedMemory() {
return 0;
#ifdef SCUMMVM_DISABLED_CODE
@@ -396,7 +396,7 @@
/**
* Returns a pointer to the active Gfx Service, or NULL if no Gfx service is active
*/
-GraphicEngine *BS_Kernel::GetGfx() {
+GraphicEngine *Kernel::GetGfx() {
return static_cast<GraphicEngine *>(GetService("gfx"));
}
@@ -405,7 +405,7 @@
/**
* Returns a pointer to the active Sfx Service, or NULL if no Sfx service is active
*/
-SoundEngine *BS_Kernel::GetSfx() {
+SoundEngine *Kernel::GetSfx() {
return static_cast<SoundEngine *>(GetService("sfx"));
}
@@ -414,7 +414,7 @@
/**
* Returns a pointer to the active input service, or NULL if no input service is active
*/
-InputEngine *BS_Kernel::GetInput() {
+InputEngine *Kernel::GetInput() {
return static_cast<InputEngine *>(GetService("input"));
}
@@ -423,7 +423,7 @@
/**
* Returns a pointer to the active package manager, or NULL if no manager is active
*/
-PackageManager *BS_Kernel::GetPackage() {
+PackageManager *Kernel::GetPackage() {
return static_cast<PackageManager *>(GetService("package"));
}
@@ -432,7 +432,7 @@
/**
* Returns a pointer to the script engine, or NULL if it is not active
*/
-ScriptEngine *BS_Kernel::GetScript() {
+ScriptEngine *Kernel::GetScript() {
return static_cast<ScriptEngine *>(GetService("script"));
}
@@ -441,13 +441,13 @@
/**
* Returns a pointer to the movie player, or NULL if it is not active
*/
-MoviePlayer *BS_Kernel::GetFMV() {
+MoviePlayer *Kernel::GetFMV() {
return static_cast<MoviePlayer *>(GetService("fmv"));
}
// -----------------------------------------------------------------------------
-void BS_Kernel::Sleep(unsigned int Msecs) const {
+void Kernel::Sleep(unsigned int Msecs) const {
g_system->delayMillis(Msecs);
}
Modified: scummvm/trunk/engines/sword25/kernel/kernel.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/kernel/kernel.h 2010-10-12 22:59:01 UTC (rev 53261)
@@ -60,7 +60,7 @@
namespace Sword25 {
// Class definitions
-class BS_Service;
+class Service;
class GraphicEngine;
class ScriptEngine;
class SoundEngine;
@@ -74,7 +74,7 @@
* This class creates and manages all other engine components such as sound engine, graphics engine ...
* It is not necessary to release all the items individually, this is performed by the Kernel class.
*/
-class BS_Kernel {
+class Kernel {
public:
// Window methods
// ----------------
@@ -82,7 +82,7 @@
/**
* Returns a pointer to the window object
*/
- BS_Window *GetWindow() {
+ Window *GetWindow() {
return _pWindow;
}
@@ -98,7 +98,7 @@
* @param ServiceIdentifier The name of the service
* For the superclass "sfx" an example could be "Fmod" or "directsound"
*/
- BS_Service *NewService(const Common::String &SuperclassIdentifier, const Common::String &ServiceIdentifier);
+ Service *NewService(const Common::String &SuperclassIdentifier, const Common::String &ServiceIdentifier);
/**
* Ends the current service of a superclass. Returns true on success, and false if the superclass
@@ -113,7 +113,7 @@
* @param SuperclassIdentfier The name of the superclass
* z.B: "sfx", "gfx", "package" ...
*/
- BS_Service *GetService(const Common::String &SuperclassIdentifier);
+ Service *GetService(const Common::String &SuperclassIdentifier);
/**
* Returns the name of the currentl active service object of a superclass.
@@ -174,7 +174,7 @@
/**
* Returns a pointer to the BS_ResourceManager
*/
- BS_ResourceManager *GetResourceManager() {
+ ResourceManager *GetResourceManager() {
return _pResourceManager;
}
/**
@@ -221,8 +221,8 @@
/**
* Returns the singleton instance for the kernel
*/
- static BS_Kernel *GetInstance() {
- if (!_Instance) _Instance = new BS_Kernel();
+ static Kernel *GetInstance() {
+ if (!_Instance) _Instance = new Kernel();
return _Instance;
}
@@ -251,26 +251,26 @@
// Private singleton methods
// -----------------------------------------------------------------------------
- BS_Kernel();
- virtual ~BS_Kernel();
+ Kernel();
+ virtual ~Kernel();
// -----------------------------------------------------------------------------
// Singleton instance
// -----------------------------------------------------------------------------
- static BS_Kernel *_Instance;
+ static Kernel *_Instance;
// Superclass class
// ----------------
class Superclass {
private:
- BS_Kernel *_pKernel;
+ Kernel *_pKernel;
unsigned int _ServiceCount;
Common::String _Identifier;
- BS_Service *_ActiveService;
+ Service *_ActiveService;
Common::String _ActiveServiceName;
public:
- Superclass(BS_Kernel *pKernel, const Common::String &Identifier);
+ Superclass(Kernel *pKernel, const Common::String &Identifier);
~Superclass();
unsigned int GetServiceCount() const {
@@ -279,14 +279,14 @@
Common::String GetIdentifier() const {
return _Identifier;
}
- BS_Service *GetActiveService() const {
+ Service *GetActiveService() const {
return _ActiveService;
}
Common::String GetActiveServiceName() const {
return _ActiveServiceName;
}
Common::String GetServiceIdentifier(unsigned int Number);
- BS_Service *NewService(const Common::String &ServiceIdentifier);
+ Service *NewService(const Common::String &ServiceIdentifier);
bool DisconnectService();
};
@@ -299,7 +299,7 @@
// Active window
// -------------
- BS_Window *_pWindow;
+ Window *_pWindow;
// Random number generator
// -----------------------
@@ -330,7 +330,7 @@
// Resourcemanager
// ---------------
- BS_ResourceManager *_pResourceManager;
+ ResourceManager *_pResourceManager;
bool _RegisterScriptBindings();
};
@@ -342,7 +342,7 @@
class BS_ServiceInfo {
public:
BS_ServiceInfo(const Common::String &SuperclassIdentifier_, const Common::String &ServiceIdentifier_,
- BS_Service*(*CreateMethod_)(BS_Kernel *)) {
+ Service*(*CreateMethod_)(Kernel *)) {
this->SuperclassIdentifier = SuperclassIdentifier_;
this->ServiceIdentifier = ServiceIdentifier_;
this->CreateMethod = CreateMethod_;
@@ -350,7 +350,7 @@
Common::String SuperclassIdentifier;
Common::String ServiceIdentifier;
- BS_Service*(*CreateMethod)(BS_Kernel *);
+ Service*(*CreateMethod)(Kernel *);
};
template<class T>
Modified: scummvm/trunk/engines/sword25/kernel/kernel_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel_script.cpp 2010-10-12 22:57:03 UTC (rev 53260)
+++ scummvm/trunk/engines/sword25/kernel/kernel_script.cpp 2010-10-12 22:59:01 UTC (rev 53261)
@@ -50,7 +50,7 @@
// -----------------------------------------------------------------------------
static int DisconnectService(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushboolean(L, pKernel->DisconnectService(luaL_checkstring(L, 1)));
@@ -61,7 +61,7 @@
// -----------------------------------------------------------------------------
static int GetActiveServiceIdentifier(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushstring(L, pKernel->GetActiveServiceIdentifier(luaL_checkstring(L, 1)).c_str());
@@ -72,7 +72,7 @@
// -----------------------------------------------------------------------------
static int GetSuperclassCount(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushnumber(L, pKernel->GetSuperclassCount());
@@ -83,7 +83,7 @@
// -----------------------------------------------------------------------------
static int GetSuperclassIdentifier(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushstring(L, pKernel->GetSuperclassIdentifier(
@@ -95,7 +95,7 @@
// -----------------------------------------------------------------------------
static int GetServiceCount(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushnumber(L, pKernel->GetServiceCount(luaL_checkstring(L, 1)));
@@ -106,7 +106,7 @@
// -----------------------------------------------------------------------------
static int GetServiceIdentifier(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1),
@@ -118,7 +118,7 @@
// -----------------------------------------------------------------------------
static int GetMilliTicks(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushnumber(L, pKernel->GetMilliTicks());
@@ -129,7 +129,7 @@
// -----------------------------------------------------------------------------
static int GetTimer(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushnumber(L, static_cast<lua_Number>(pKernel->GetMicroTicks()) / 1000000.0);
@@ -140,7 +140,7 @@
// -----------------------------------------------------------------------------
static int StartService(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
lua_pushbooleancpp(L, pKernel->NewService(luaL_checkstring(L, 1), luaL_checkstring(L, 2)) != NULL);
@@ -151,7 +151,7 @@
// -----------------------------------------------------------------------------
static int Sleep(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
pKernel->Sleep(static_cast<unsigned int>(luaL_checknumber(L, 1) * 1000));
return 0;
@@ -160,7 +160,7 @@
// -----------------------------------------------------------------------------
static int Crash(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
pKernel->Crash();
return 0;
@@ -169,7 +169,7 @@
// -----------------------------------------------------------------------------
static int ExecuteFile(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
ScriptEngine *pSE = static_cast<ScriptEngine *>(pKernel->GetService("script"));
BS_ASSERT(pSE);
@@ -182,28 +182,28 @@
// -----------------------------------------------------------------------------
static int GetUserdataDirectory(lua_State *L) {
- lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetUserdataDirectory().c_str());
+ lua_pushstring(L, FileSystemUtil::GetInstance().GetUserdataDirectory().c_str());
return 1;
}
// -----------------------------------------------------------------------------
static int GetPathSeparator(lua_State *L) {
- lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetPathSeparator().c_str());
+ lua_pushstring(L, FileSystemUtil::GetInstance().GetPathSeparator().c_str());
return 1;
}
// -----------------------------------------------------------------------------
static int FileExists(lua_State *L) {
- lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1)));
+ lua_pushbooleancpp(L, FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1)));
return 1;
}
// -----------------------------------------------------------------------------
static int CreateDirectory(lua_State *L) {
- lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1)));
+ lua_pushbooleancpp(L, FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1)));
return 1;
}
@@ -225,7 +225,7 @@
// -----------------------------------------------------------------------------
static int GetUsedMemory(lua_State *L) {
- lua_pushnumber(L, BS_Kernel::GetInstance()->GetUsedMemory());
+ lua_pushnumber(L, Kernel::GetInstance()->GetUsedMemory());
return 1;
}
@@ -259,9 +259,9 @@
// -----------------------------------------------------------------------------
static int IsVisible(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_Window *pWindow = pKernel->GetWindow();
+ Window *pWindow = pKernel->GetWindow();
BS_ASSERT(pWindow);
lua_pushbooleancpp(L, pWindow->IsVisible());
@@ -272,9 +272,9 @@
// -----------------------------------------------------------------------------
static int SetVisible(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_Window *pWindow = pKernel->GetWindow();
+ Window *pWindow = pKernel->GetWindow();
BS_ASSERT(pWindow);
pWindow->SetVisible(lua_tobooleancpp(L, 1));
@@ -285,9 +285,9 @@
// -----------------------------------------------------------------------------
static int GetX(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_Window *pWindow = pKernel->GetWindow();
+ Window *pWindow = pKernel->GetWindow();
BS_ASSERT(pWindow);
lua_pushnumber(L, pWindow->GetX());
@@ -298,9 +298,9 @@
// -----------------------------------------------------------------------------
static int GetY(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_Window *pWindow = pKernel->GetWindow();
+ Window *pWindow = pKernel->GetWindow();
BS_ASSERT(pWindow);
lua_pushnumber(L, pWindow->GetY());
@@ -311,9 +311,9 @@
// -----------------------------------------------------------------------------
static int SetX(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_Window *pWindow = pKernel->GetWindow();
+ Window *pWindow = pKernel->GetWindow();
BS_ASSERT(pWindow);
pWindow->SetX(static_cast<int>(luaL_checknumber(L, 1)));
@@ -324,9 +324,9 @@
// -----------------------------------------------------------------------------
static int SetY(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_Window *pWindow = pKernel->GetWindow();
+ Window *pWindow = pKernel->GetWindow();
BS_ASSERT(pWindow);
pWindow->SetY(static_cast<int>(luaL_checknumber(L, 1)));
@@ -337,9 +337,9 @@
// -----------------------------------------------------------------------------
static int GetClientX(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
- BS_Window *pWindow = pKernel->GetWindow();
+ Window *pWindow = pKernel->GetWindow();
BS_ASSERT(pWindow);
lua_pushnumber(L, pWindow->GetClientX());
@@ -350,9 +350,9 @@
// -----------------------------------------------------------------------------
static int GetClientY(lua_State *L) {
- BS_Kernel *pKernel = BS_Kernel::GetInstance();
+ Kernel *pKernel = Kernel::GetInstance();
BS_ASSERT(pKernel);
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list