[Scummvm-cvs-logs] SF.net SVN: scummvm:[53478] scummvm/trunk/engines/sword25

[fingolfin at users.sourceforge.net]

Revision: 53478
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53478&view=rev
Author:   fingolfin
Date:     2010-10-15 12:18:41 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
SWORD25: Typo, cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/fontresource.cpp
    scummvm/trunk/engines/sword25/gfx/fontresource.h
    scummvm/trunk/engines/sword25/sword25.cpp

Modified: scummvm/trunk/engines/sword25/gfx/fontresource.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.cpp	2010-10-15 12:18:19 UTC (rev 53477)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.cpp	2010-10-15 12:18:41 UTC (rev 53478)
@@ -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) :

Modified: scummvm/trunk/engines/sword25/gfx/fontresource.h
===================================================================
--- scummvm/trunk/engines/sword25/gfx/fontresource.h	2010-10-15 12:18:19 UTC (rev 53477)
+++ scummvm/trunk/engines/sword25/gfx/fontresource.h	2010-10-15 12:18:41 UTC (rev 53478)
@@ -54,7 +54,7 @@
 class Kernel;
 
 // -----------------------------------------------------------------------------
-// Klassendefinition
+// Class definition
 // -----------------------------------------------------------------------------
 
 class FontResource : public Resource, Common::XMLParser {
@@ -139,14 +139,6 @@
 	// 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

Modified: scummvm/trunk/engines/sword25/sword25.cpp
===================================================================
--- scummvm/trunk/engines/sword25/sword25.cpp	2010-10-15 12:18:19 UTC (rev 53477)
+++ scummvm/trunk/engines/sword25/sword25.cpp	2010-10-15 12:18:41 UTC (rev 53478)
@@ -163,7 +163,7 @@
 
 	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 @@
 				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))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.