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

[peres001 at users.sourceforge.net]

Revision: 29326
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29326&view=rev
Author:   peres001
Date:     2007-10-30 12:41:55 -0700 (Tue, 30 Oct 2007)

Log Message:
-----------
Fix for bug #1822680.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-10-30 17:21:38 UTC (rev 29325)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-10-30 19:41:55 UTC (rev 29326)
@@ -1015,6 +1015,8 @@
 	_head = NULL;
 	_objs = NULL;
 
+	_dummy = false;
+
 	_ani._left = 150;
 	_ani._top = 100;
 	_ani._z = 10;
@@ -1086,22 +1088,18 @@
 	_prefix = _empty;
 	_suffix = _empty;
 
-	if (IS_DUMMY_CHARACTER(name)) {
-		begin = 0;
-		end = 0;
-	} else {
+	_dummy = IS_DUMMY_CHARACTER(name);
 
+	if (!_dummy) {
 		const char *s = strstr(name, "tras");
 		if (s) {
 			_suffix = _suffixTras;
 			end = s;
 		}
-
 		if (IS_MINI_CHARACTER(name)) {
 			_prefix = _prefixMini;
 			begin = name+4;
 		}
-
 	}
 
 	memset(_baseName, 0, 30);
@@ -1137,6 +1135,9 @@
 	return _fullName;
 }
 
+bool Character::dummy() const {
+	return _dummy;
+}
 
 void Parallaction::beep() {
 	_soundMan->playSfx("beep", 3, false);

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-10-30 17:21:38 UTC (rev 29325)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-10-30 19:41:55 UTC (rev 29326)
@@ -231,6 +231,8 @@
 	const char *_prefix;
 	const char *_suffix;
 
+	bool _dummy;
+
 	char _name[30];
 	char _baseName[30];
 	char _fullName[30];
@@ -244,6 +246,7 @@
 	const char *getName() const;
 	const char *getBaseName() const;
 	const char *getFullName() const;
+	bool dummy() const;
 };
 
 

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-10-30 17:21:38 UTC (rev 29325)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-10-30 19:41:55 UTC (rev 29326)
@@ -364,7 +364,7 @@
 	Common::String oldArchive = _disk->selectArchive((getFeatures() & GF_LANG_MULT) ? "disk1" : "disk0");
 	_char._ani._cnv = _disk->loadFrames(_char.getFullName());
 
-	if (_char.getBaseName()[0] != '\0') {
+	if (!_char.dummy()) {
 		if (getPlatform() == Common::kPlatformAmiga && (getFeatures() & GF_LANG_MULT))
 			_disk->selectArchive("disk0");
 


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