aboutsummaryrefslogtreecommitdiff
path: root/engines/drascula
diff options
context:
space:
mode:
authorTorbjörn Andersson2007-08-02 22:23:57 +0000
committerTorbjörn Andersson2007-08-02 22:23:57 +0000
commit8ecda22a8c0d438b1134f4c1c034b791adb671fe (patch)
tree3afb768686893703f91d7ac9b54edc4c374d155a /engines/drascula
parenta2aec6c753b7d2881a2460e039d5309e6120de62 (diff)
downloadscummvm-rg350-8ecda22a8c0d438b1134f4c1c034b791adb671fe.tar.gz
scummvm-rg350-8ecda22a8c0d438b1134f4c1c034b791adb671fe.tar.bz2
scummvm-rg350-8ecda22a8c0d438b1134f4c1c034b791adb671fe.zip
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. svn-id: r28419
Diffstat (limited to 'engines/drascula')
-rw-r--r--engines/drascula/drascula.cpp13
-rw-r--r--engines/drascula/drascula.h8
2 files changed, 12 insertions, 9 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 3cae993bab..df433e12f0 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -6199,7 +6199,7 @@ void DrasculaEngine::animacion_35() {
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 @@ bucless:
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 @@ bucless:
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 @@ void DrasculaEngine::habla_ciego(char dicho[], char filename[], char sincronia[]
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 @@ bucless:
}
}
-void DrasculaEngine::habla_hacker(char dicho[], char filename[]) {
+void DrasculaEngine::habla_hacker(const char *dicho, const char *filename) {
int tiempou;
long tiempol;
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 2c5e5bef0a..d8e49ba930 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -476,10 +476,10 @@ public:
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();