aboutsummaryrefslogtreecommitdiff
path: root/scumm/insane
diff options
context:
space:
mode:
authorMax Horn2004-01-27 00:13:25 +0000
committerMax Horn2004-01-27 00:13:25 +0000
commitb1274d70d9fba33b20088e87e3271077e39491c2 (patch)
treefecd577d38a73bc6e6e801046ece2fdd70928312 /scumm/insane
parent498e0f4d6f088a77ad450ed782befc4a799cdf24 (diff)
downloadscummvm-rg350-b1274d70d9fba33b20088e87e3271077e39491c2.tar.gz
scummvm-rg350-b1274d70d9fba33b20088e87e3271077e39491c2.tar.bz2
scummvm-rg350-b1274d70d9fba33b20088e87e3271077e39491c2.zip
const'ness fixes
svn-id: r12631
Diffstat (limited to 'scumm/insane')
-rw-r--r--scumm/insane/insane.cpp6
-rw-r--r--scumm/insane/insane.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index 28c114c510..d993c64ae9 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -1262,7 +1262,7 @@ void Insane::smlayer_overrideDrawActorAt(byte *arg_0, byte arg_4, byte arg_8) {
void Insane::smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecparam,
int32 pos_x, int32 pos_y, int32 arg_14, int32 arg_18,
- int32 flags, const char *formatString, char *strng) {
+ int32 flags, const char *formatString, const char *strng) {
SmushFont *sf = _player->_sf[0];
int color = 1, top = 0;
char *str = NULL, *string;
@@ -1366,8 +1366,8 @@ void Insane::smlayer_setActorFacing(int actornum, int actnum, int frame, int dir
}
}
-char *Insane::handleTrsTag(int32 trsId) {
- return _player->getString(trsId);;
+const char *Insane::handleTrsTag(int32 trsId) {
+ return _player->getString(trsId);
}
bool Insane::smush_eitherNotStartNewFrame(void) {
diff --git a/scumm/insane/insane.h b/scumm/insane/insane.h
index e96c2883a0..4bf8197a30 100644
--- a/scumm/insane/insane.h
+++ b/scumm/insane/insane.h
@@ -99,7 +99,7 @@ class Insane {
int32 _currEnemy;
int32 _currScenePropIdx;
int32 _currScenePropSubIdx;
- char *_currTrsMsg;
+ const char *_currTrsMsg;
int16 _sceneData2Loaded;
int16 _sceneData1Loaded;
int16 _keyboardDisable;
@@ -385,7 +385,7 @@ class Insane {
void smush_rewindCurrentSan(int arg_0, int arg_4, int arg_8);
void smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecparam,
int32 x, int32 y, int32 arg_14, int32 arg_18,
- int32 arg_1C, const char *formatString, char *str);
+ int32 arg_1C, const char *formatString, const char *str);
void init_fluConfStruct(int n, int sceneId, byte **fluPtr,
const char *filenamePtr, int startFrame, int numFrames);
int32 processBenOnRoad(bool flag);
@@ -419,7 +419,7 @@ class Insane {
int32 setBenState(void);
bool smlayer_actorNeedRedraw(int actornum, int actnum);
void reinitActors(void);
- char *handleTrsTag(int32 trsId);
+ const char *handleTrsTag(int32 trsId);
void ouchSoundBen(void);
void smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1,
int32 step2, int32 setupsan1, byte *fluPtr, int32 numFrames);