[Scummvm-cvs-logs] SF.net SVN: scummvm: [28419] scummvm/trunk/engines/drascula

[eriktorbjorn at users.sourceforge.net]

Revision: 28419
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28419&view=rev
Author:   eriktorbjorn
Date:     2007-08-02 15:23:57 -0700 (Thu, 02 Aug 2007)

Log Message:
-----------
Fixed some of the compiler warnings, and added a FIXME comment (and #if 0:ed)
to where we're trying to modify a string constant.

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/drascula.h

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2007-08-02 22:12:20 UTC (rev 28418)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2007-08-02 22:23:57 UTC (rev 28419)
@@ -6199,7 +6199,7 @@
 	salir_al_dos(3);
 }
 
-void DrasculaEngine::habla_vb(char dicho[], char filename[]) {
+void DrasculaEngine::habla_vb(const char *dicho, const char *filename) {
 	int tiempou;
 	long tiempol;
 
@@ -6272,7 +6272,7 @@
 		playmusic(musica_room);
 }
 
-void DrasculaEngine::habla_vbpuerta(char dicho[], char filename[]) {
+void DrasculaEngine::habla_vbpuerta(const char *dicho, const char *filename) {
 	int tiempou;
 	long tiempol;
 
@@ -6326,7 +6326,7 @@
 		playmusic(musica_room);
 }
 
-void DrasculaEngine::habla_ciego(char dicho[], char filename[], char sincronia[]) {
+void DrasculaEngine::habla_ciego(const char *dicho, const char *filename, const char *sincronia) {
 	byte *num_cara;
 	int p;
 	int pos_ciego[6];
@@ -6339,8 +6339,11 @@
 
 	color_abc(VON_BRAUN);
 
-    for (p = 0; sincronia[p]; p++)
+	// FIXME: We can't do this to a read-only string!
+#if 0
+	for (p = 0; sincronia[p]; p++)
 		sincronia[p] = toupper(sincronia[p]);
+#endif
 
 	p = 0;
 	DIBUJA_FONDO(0, 0, 0, 0, 320, 200, dir_dibujo1, dir_zona_pantalla);
@@ -6430,7 +6433,7 @@
 	}
 }
 
-void DrasculaEngine::habla_hacker(char dicho[], char filename[]) {
+void DrasculaEngine::habla_hacker(const char *dicho, const char *filename) {
 	int tiempou;
 	long tiempol;
 

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2007-08-02 22:12:20 UTC (rev 28418)
+++ scummvm/trunk/engines/drascula/drascula.h	2007-08-02 22:23:57 UTC (rev 28419)
@@ -476,10 +476,10 @@
 
 	bool escoba();
 	void Negro();
-	void habla_vb(char[], char[]);
-	void habla_vbpuerta(char dicho[], char filename[]);
-	void habla_ciego(char[], char[], char[]);
-	void habla_hacker(char[], char[]);
+	void habla_vb(const char *, const char *);
+	void habla_vbpuerta(const char *dicho, const char *filename);
+	void habla_ciego(const char *, const char *, const char *);
+	void habla_hacker(const char *, const char *);
 	void agarra_objeto(int);
 	void anda_parriba();
 	void anda_pabajo();


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