From f52b31a05f9b234a367dd83b89cceaa3d9848204 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 15 Oct 2010 12:18:41 +0000 Subject: SWORD25: Typo, cleanup svn-id: r53478 --- engines/sword25/gfx/fontresource.cpp | 10 ++++++---- engines/sword25/gfx/fontresource.h | 10 +--------- engines/sword25/sword25.cpp | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) (limited to 'engines/sword25') diff --git a/engines/sword25/gfx/fontresource.cpp b/engines/sword25/gfx/fontresource.cpp index 2e64a20daa..f7d37e8bdd 100644 --- a/engines/sword25/gfx/fontresource.cpp +++ b/engines/sword25/gfx/fontresource.cpp @@ -47,14 +47,16 @@ namespace Sword25 { // ----------------------------------------------------------------------------- -// Konstanten +// Constants // ----------------------------------------------------------------------------- -static const uint DEFAULT_LINEHEIGHT = 20; -static const uint DEFAULT_GAPWIDTH = 1; +enum { + DEFAULT_LINEHEIGHT = 20, + DEFAULT_GAPWIDTH = 1 +}; // ----------------------------------------------------------------------------- -// Konstruktion / Destruktion +// Constructor / destructor // ----------------------------------------------------------------------------- FontResource::FontResource(Kernel *pKernel, const Common::String &FileName) : diff --git a/engines/sword25/gfx/fontresource.h b/engines/sword25/gfx/fontresource.h index cfb0251084..7ae2cd2c6b 100644 --- a/engines/sword25/gfx/fontresource.h +++ b/engines/sword25/gfx/fontresource.h @@ -54,7 +54,7 @@ namespace Sword25 { class Kernel; // ----------------------------------------------------------------------------- -// Klassendefinition +// Class definition // ----------------------------------------------------------------------------- class FontResource : public Resource, Common::XMLParser { @@ -139,14 +139,6 @@ private: // Parser callback methods bool parserCallback_font(ParserNode *node); bool parserCallback_character(ParserNode *node); - - // ----------------------------------------------------------------------------- - // Hilfsmethoden - // ----------------------------------------------------------------------------- - -// bool _ParseXMLDocument(const Common::String &FileName, TiXmlDocument &Doc) const; -// bool _ParseFontTag(TiXmlElement &Tag, Common::String &BitmapFileName, int &LineHeight, int &GapWidth) const; -// bool _ParseCharacterTag(TiXmlElement &Tag, int &Code, Common::Rect &Rect) const; }; } // End of namespace Sword25 diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp index 0d49d32f2d..772c50ae01 100644 --- a/engines/sword25/sword25.cpp +++ b/engines/sword25/sword25.cpp @@ -163,7 +163,7 @@ bool Sword25Engine::loadPackages() { Common::sort(files.begin(), files.end()); - // Identity all patch packages + // Identify all patch packages // The filename of patch packages must have the form patch??.b25c, with the question marks // are placeholders for numbers. // Since the filenames have been sorted, patches are mounted with low numbers first, through @@ -175,7 +175,7 @@ bool Sword25Engine::loadPackages() { return false; } - // Identity and mount all language packages + // Identify and mount all language packages // The filename of the packages have the form lang_*.b25c (eg. lang_de.b25c) for (Common::FSList::const_iterator it = files.begin(); it != files.end(); ++it) { if (it->getName().matchString("lang_*.b25c", true)) -- cgit v1.2.3