[Scummvm-cvs-logs] SF.net SVN: scummvm:[33511] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 33511
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33511&view=rev
Author:   peres001
Date:     2008-08-02 02:43:05 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Fixed issues detected by DrMcCoy's obnoxious compiler. ;)

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parser.cpp
    scummvm/trunk/engines/parallaction/parser_br.cpp

Modified: scummvm/trunk/engines/parallaction/parser.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser.cpp	2008-08-02 02:26:09 UTC (rev 33510)
+++ scummvm/trunk/engines/parallaction/parser.cpp	2008-08-02 02:43:05 UTC (rev 33511)
@@ -264,13 +264,14 @@
 	}
 
 public:
-	uint score;
-	const char*	name;
+	uint _score;
+	const char*	_name;
 
 
-	StatementDef(uint score, const char *name) : score(score), name(name) { }
+	StatementDef(uint score, const char *name) : _score(score), _name(name) { }
+	virtual ~StatementDef() { }
 
-	virtual Common::String makeLine(Script &script) = 0;;
+	virtual Common::String makeLine(Script &script) = 0;
 
 };
 
@@ -290,12 +291,12 @@
 
 class BlockStatementDef : public StatementDef {
 
-	const char*	ending1;
-	const char*	ending2;
+	const char*	_ending1;
+	const char*	_ending2;
 
 public:
-	BlockStatementDef(uint score, const char *name, const char *ending1, const char *ending2 = 0) : StatementDef(score, name), ending1(ending1),
-		ending2(ending2) { }
+	BlockStatementDef(uint score, const char *name, const char *ending1, const char *ending2 = 0) : StatementDef(score, name), _ending1(ending1),
+		_ending2(ending2) { }
 
 	Common::String makeLine(Script &script) {
 		Common::String text = makeLineFromTokens();
@@ -303,7 +304,7 @@
 		do {
 			script.readLineToken(true);
 			text += makeLineFromTokens();
-			end = !scumm_stricmp(ending1, _tokens[0]) || (ending2 && !scumm_stricmp(ending2, _tokens[0]));
+			end = !scumm_stricmp(_ending1, _tokens[0]) || (_ending2 && !scumm_stricmp(_ending2, _tokens[0]));
 		} while (!end);
 		return text;
 	}
@@ -373,7 +374,7 @@
 StatementDef* PreProcessor::findDef(const char* name) {
 	DefList::iterator it = _defs.begin();
 	for (; it != _defs.end(); it++) {
-		if (!scumm_stricmp((*it)->name, name)) {
+		if (!scumm_stricmp((*it)->_name, name)) {
 			return *it;
 		}
 	}
@@ -383,11 +384,11 @@
 
 
 uint PreProcessor::getDefScore(StatementDef* def) {
-	if (def->score == BLOCK_BASE) {
+	if (def->_score == BLOCK_BASE) {
 		_numZones++;
 		return (_numZones + BLOCK_BASE);
 	}
-	return def->score;
+	return def->_score;
 }
 
 
@@ -404,7 +405,7 @@
 
 		text = def->makeLine(script);
 		int score = getDefScore(def);
-		list.push_back(StatementListNode(score, def->name, text));
+		list.push_back(StatementListNode(score, def->_name, text));
 	} while (true);
 	Common::sort(list.begin(), list.end());
 }

Modified: scummvm/trunk/engines/parallaction/parser_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_br.cpp	2008-08-02 02:26:09 UTC (rev 33510)
+++ scummvm/trunk/engines/parallaction/parser_br.cpp	2008-08-02 02:43:05 UTC (rev 33511)
@@ -25,7 +25,6 @@
 
 
 #include "parallaction/parallaction.h"
-#include "parallaction/preprocessor.h"
 
 #include "parallaction/sound.h"
 


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