[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.9,1.10 insane.h,1.6,1.7
Max Horn
fingolfin at users.sourceforge.net
Wed Jan 28 00:54:56 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm/insane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3341
Modified Files:
insane.cpp insane.h
Log Message:
const'ness fixes
Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- insane.cpp 26 Jan 2004 22:44:46 -0000 1.9
+++ insane.cpp 27 Jan 2004 00:13:25 -0000 1.10
@@ -1262,7 +1262,7 @@
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 @@
}
}
-char *Insane::handleTrsTag(int32 trsId) {
- return _player->getString(trsId);;
+const char *Insane::handleTrsTag(int32 trsId) {
+ return _player->getString(trsId);
}
bool Insane::smush_eitherNotStartNewFrame(void) {
Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- insane.h 26 Jan 2004 22:44:46 -0000 1.6
+++ insane.h 27 Jan 2004 00:13:25 -0000 1.7
@@ -99,7 +99,7 @@
int32 _currEnemy;
int32 _currScenePropIdx;
int32 _currScenePropSubIdx;
- char *_currTrsMsg;
+ const char *_currTrsMsg;
int16 _sceneData2Loaded;
int16 _sceneData1Loaded;
int16 _keyboardDisable;
@@ -385,7 +385,7 @@
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 @@
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);
More information about the Scummvm-git-logs
mailing list