[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.8,1.9 verb.h,1.4,1.5

David Eriksson twogood at users.sourceforge.net
Thu Nov 6 00:54:02 CET 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv27812/queen

Modified Files:
	command.cpp verb.h 
Log Message:
Clean-up


Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- command.cpp	6 Nov 2003 08:44:33 -0000	1.8
+++ command.cpp	6 Nov 2003 08:53:09 -0000	1.9
@@ -857,27 +857,20 @@
 
 bool Command::executeIfDialog(const char *description) {
 
-  if (strlen(description) > 4 && 
-      scumm_stricmp(description + strlen(description) - 4, ".dog") == 0) {
-    char cutaway[20];
+	if (strlen(description) > 4 && 
+			scumm_stricmp(description + strlen(description) - 4, ".dog") == 0) {
+		char cutaway[20];
 
-    _logic->dialogue(description, _curCmd.noun, cutaway);
+		_logic->dialogue(description, _curCmd.noun, cutaway);
 
-    while (cutaway[0] != '\0') {
-      char currentCutaway[20];
-      strcpy(currentCutaway, cutaway);
-      _logic->playCutaway(currentCutaway, cutaway);
-    }
+		while (cutaway[0] != '\0') {
+			char currentCutaway[20];
+			strcpy(currentCutaway, cutaway);
+			_logic->playCutaway(currentCutaway, cutaway);
+		}
 
-    /* XXX
-       talk(Kstr);
-       strcpy(Kstr,Paramstr);
-       while(Kstr[0]) {
-       CUTAWAY(Kstr);
-       strcpy(Kstr,Paramstr);
-       }*/
-    return true;
-  }
+		return true;
+	}
 	return false;
 }
 

Index: verb.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/verb.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- verb.h	6 Nov 2003 08:44:33 -0000	1.4
+++ verb.h	6 Nov 2003 08:53:09 -0000	1.5
@@ -111,9 +111,9 @@
 			_verb <= VERB_DIGIT_LAST;
 	}
 
-  int digit() const {
-    return (int)_verb - VERB_DIGIT_1 + 1;
-  }
+	int digit() const {
+		return (int)_verb - VERB_DIGIT_1 + 1;
+	}
 
 	bool isSkipText() const {
 		return _verb == VERB_SKIP_TEXT;





More information about the Scummvm-git-logs mailing list