[Scummvm-cvs-logs] SF.net SVN: scummvm:[39791] scummvm/trunk/engines/cruise

[lordhoto at users.sourceforge.net]

Revision: 39791
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39791&view=rev
Author:   lordhoto
Date:     2009-04-01 14:02:55 +0000 (Wed, 01 Apr 2009)

Log Message:
-----------
Fix compilation via manually implementing strToUpper, instead of relying on strupr.

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/function.cpp
    scummvm/trunk/engines/cruise/volume.cpp
    scummvm/trunk/engines/cruise/volume.h

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2009-04-01 14:00:17 UTC (rev 39790)
+++ scummvm/trunk/engines/cruise/function.cpp	2009-04-01 14:02:55 UTC (rev 39791)
@@ -39,7 +39,7 @@
 	char overlayName[38] = "";
 	int overlayLoadResult;
 
-	pOverlayName = (char *) popPtr();
+	pOverlayName = (char *)popPtr();
 
 	if (strlen(pOverlayName) == 0)
 		return 0;
@@ -1232,7 +1232,7 @@
 	char buffer[33];
 
 	strcpy(buffer, ptr);
-	strupr(buffer);
+	strToUpper(buffer);
 	_vm->music().loadSong(buffer);
 
 	changeCursor(CURSOR_NORMAL);

Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp	2009-04-01 14:00:17 UTC (rev 39790)
+++ scummvm/trunk/engines/cruise/volume.cpp	2009-04-01 14:02:55 UTC (rev 39791)
@@ -468,6 +468,17 @@
 
 ///////////////////////////::
 
+// This code used to rely on "strupr", which is non existant on my system,
+// thus I just implemented this function instead. - LordHoto
+//
+// TODO: This might be code duplication, please check this out.
+void strToUpper(char *string) {
+	while (*string) {
+		*string = toupper(*string);
+		++string;
+	}
+}
+
 void drawMsgString(const char *string) {
 	//printf("%s\n",string);
 }

Modified: scummvm/trunk/engines/cruise/volume.h
===================================================================
--- scummvm/trunk/engines/cruise/volume.h	2009-04-01 14:00:17 UTC (rev 39790)
+++ scummvm/trunk/engines/cruise/volume.h	2009-04-01 14:02:55 UTC (rev 39791)
@@ -36,8 +36,8 @@
 
 ////////////////
 
-#define strToUpper(FILENAME) strupr(FILENAME)
-void drawMsgString(const char * string);
+void strToUpper(char *string);
+void drawMsgString(const char *string);
 void askDisk(int16 discNumber);
 void setObjectPosition(int16 param1, int16 param2, int16 param3, int16 param4);
 


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