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

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Feb 14 01:36:06 CET 2007


Revision: 25577
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25577&view=rev
Author:   sev
Date:     2007-02-13 16:36:06 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
More skip_whitespace -> Common::ltrim(). For real now.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/animation.cpp
    scummvm/trunk/engines/parallaction/defs.h
    scummvm/trunk/engines/parallaction/dialogue.cpp
    scummvm/trunk/engines/parallaction/graphics.cpp
    scummvm/trunk/engines/parallaction/table.cpp

Modified: scummvm/trunk/engines/parallaction/animation.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/animation.cpp	2007-02-14 00:21:53 UTC (rev 25576)
+++ scummvm/trunk/engines/parallaction/animation.cpp	2007-02-14 00:36:06 UTC (rev 25577)
@@ -313,7 +313,7 @@
 		vCE = readArchivedFileText(vCA, 200, file);
 		if (vCE == 0) return 0;
 
-		skip_whitespace(vCE);
+		Common::ltrim(vCE);
 	} while (strlen(vCE) == 0 || vCE[0] == '#');
 
 	while (strlen(vCE) > 0 && _si < 20) {
@@ -327,7 +327,7 @@
 
 		}
 
-		vCE = skip_whitespace(vCE);
+		vCE = Common::ltrim(vCE);
 		_si++;
 	}
 

Modified: scummvm/trunk/engines/parallaction/defs.h
===================================================================
--- scummvm/trunk/engines/parallaction/defs.h	2007-02-14 00:21:53 UTC (rev 25576)
+++ scummvm/trunk/engines/parallaction/defs.h	2007-02-14 00:36:06 UTC (rev 25577)
@@ -99,7 +99,6 @@
 void errorFileNotFound(const char*);
 
 void beep();
-char *skip_whitespace(char *s);
 
 enum {
 	kDebugDisk = 1 << 0,

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2007-02-14 00:21:53 UTC (rev 25576)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2007-02-14 00:36:06 UTC (rev 25577)
@@ -182,7 +182,7 @@
 		vD0 = parseNextLine(vC8, 200);
 		if (vD0 == 0) return NULL;
 
-		vD0 = skip_whitespace(vD0);
+		vD0 = Common::ltrim(vD0);
 
 	} while (strlen(vD0) == 0);
 

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2007-02-14 00:21:53 UTC (rev 25576)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2007-02-14 00:36:06 UTC (rev 25577)
@@ -724,7 +724,7 @@
 		rx += getStringWidth(token) + getStringWidth(" ");
 		linewidth += getStringWidth(" ");
 
-		text = skip_whitespace(text);
+		text = Common::ltrim(text);
 	}
 
 //	printf("done\n");
@@ -781,7 +781,7 @@
 		}
 
 		w += getStringWidth(" ");
-		text = skip_whitespace(text);
+		text = Common::ltrim(text);
 	}
 
 	if (*width < w) *width = w;

Modified: scummvm/trunk/engines/parallaction/table.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/table.cpp	2007-02-14 00:21:53 UTC (rev 25576)
+++ scummvm/trunk/engines/parallaction/table.cpp	2007-02-14 00:36:06 UTC (rev 25577)
@@ -46,7 +46,7 @@
 		line = stream.readLine(buf, 200);
 		if (line == NULL) return 0;
 
-		line = skip_whitespace(line);
+		line = Common::ltrim(line);
 	} while (strlen(line) == 0 || line[0] == '#');
 
 	uint16 count = 0;
@@ -61,7 +61,7 @@
 
 		}
 
-		line = skip_whitespace(line);
+		line = Common::ltrim(line);
 		count++;
 	}
 


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




More information about the Scummvm-git-logs mailing list