[Scummvm-cvs-logs] SF.net SVN: scummvm: [27011] scummvm/trunk/engines/cruise
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed May 30 16:38:18 CEST 2007
Revision: 27011
http://scummvm.svn.sourceforge.net/scummvm/?rev=27011&view=rev
Author: fingolfin
Date: 2007-05-30 07:38:17 -0700 (Wed, 30 May 2007)
Log Message:
-----------
Several const correctness fixes
Modified Paths:
--------------
scummvm/trunk/engines/cruise/cruise_main.cpp
scummvm/trunk/engines/cruise/cruise_main.h
scummvm/trunk/engines/cruise/font.cpp
scummvm/trunk/engines/cruise/font.h
scummvm/trunk/engines/cruise/menu.cpp
scummvm/trunk/engines/cruise/overlay.cpp
scummvm/trunk/engines/cruise/overlay.h
scummvm/trunk/engines/cruise/stringSupport.cpp
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2007-05-30 14:38:17 UTC (rev 27011)
@@ -477,7 +477,7 @@
resetActorPtr(&actorHead);
resetBackgroundIncrustList(&backgroundIncrustHead);
- bootOverlayNumber = loadOverlay((uint8 *) "AUTO00");
+ bootOverlayNumber = loadOverlay((const uint8 *) "AUTO00");
#ifdef DUMP_SCRIPT
loadOverlay("TITRE");
Modified: scummvm/trunk/engines/cruise/cruise_main.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.h 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/cruise_main.h 2007-05-30 14:38:17 UTC (rev 27011)
@@ -86,7 +86,7 @@
scriptInstanceStruct * pScriptInstance, int newValue, int param3);
uint8 *getDataFromData3(ovlData3Struct * ptr, int param);
int32 prepareWordRender(int32 param, int32 var1, int16 * out2, uint8 * ptr3,
- uint8 * string);
+ const uint8 * string);
void removeExtention(const char *name, char *buffer);
void resetRaster(uint8 * rasterPtr, int32 rasterSize);
void changeCursor(uint16 cursorType);
Modified: scummvm/trunk/engines/cruise/font.cpp
===================================================================
--- scummvm/trunk/engines/cruise/font.cpp 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/font.cpp 2007-05-30 14:38:17 UTC (rev 27011)
@@ -50,15 +50,15 @@
// this function determins how many lines the text will have (old: fontProc2(int32 param1, int32 param2, uint8* ptr, uint8* string))
int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth,
- uint8 *ptr, uint8 *textString) {
- uint8 *localString = textString;
- uint8 *currentStringPtr;
+ uint8 *ptr, const uint8 *textString) {
+ const uint8 *localString = textString;
+ const uint8 *currentStringPtr;
uint8 character;
int32 var_6 = 0;
int32 lineLength = 0;
- uint8 *tempPtr = 0;
+ const uint8 *tempPtr = 0;
if (!*localString) {
return (0);
@@ -111,16 +111,16 @@
int32 fontSize;
int32 data2;
uint8 data3[6];
- uint8 *fileName = (uint8 *) fileNameChar;
+ const uint8 *fileName = (const uint8 *)fileNameChar;
_systemFNT = NULL;
Common::File fontFileHandle;
- if (!fontFileHandle.exists((char *)fileName)) {
+ if (!fontFileHandle.exists((const char *)fileName)) {
return;
}
- fontFileHandle.open((char *)fileName);
+ fontFileHandle.open((const char *)fileName);
fontFileHandle.read(header, 4);
@@ -134,7 +134,7 @@
fontFileHandle.read(data3, 6); // may need an endian flip ?
flipGen(&data3, 6);
- _systemFNT = (uint8 *) mallocAndZero(fontSize);
+ _systemFNT = (uint8 *)mallocAndZero(fontSize);
if (_systemFNT != NULL) {
int32 i;
@@ -151,8 +151,8 @@
currentPtr = _systemFNT + 14;
- for (i = 0; i < *(int16 *) (_systemFNT + 8); i++) {
- flipLong((int32 *) currentPtr);
+ for (i = 0; i < *(int16 *)(_systemFNT + 8); i++) {
+ flipLong((int32 *)currentPtr);
currentPtr += 4;
flipGen(currentPtr, 8);
@@ -277,8 +277,8 @@
// returns character count and pixel size (via pointer) per line of the string (old: prepareWordRender(int32 param, int32 var1, int16* out2, uint8* ptr3, uint8* string))
int32 prepareWordRender(int32 inRightBorder_X, int32 wordSpacingWidth,
- int16 * strPixelLength, uint8 * ptr3, uint8 * textString) {
- uint8 *localString = textString;
+ int16 * strPixelLength, uint8 * ptr3, const uint8 * textString) {
+ const uint8 *localString = textString;
int32 counter = 0;
int32 finish = 0;
@@ -518,7 +518,7 @@
}
// calculates all necessary datas and renders text
-gfxEntryStruct *renderText(int inRightBorder_X, uint8 *string) {
+gfxEntryStruct *renderText(int inRightBorder_X, const uint8 *string) {
uint8 *fontPtr;
uint8 *fontPtr_Data; // pt2
uint8 *fontPtr_Desc; // ptr3
@@ -600,7 +600,7 @@
int spacesCount = 0; // si
unsigned char character = *string;
short int strPixelLength; // var_16
- uint8 *ptrStringEnd; // var_4 //ok
+ const uint8 *ptrStringEnd; // var_4 //ok
int drawPosPixel_X; // di
// find first letter in string, skip all spaces
Modified: scummvm/trunk/engines/cruise/font.h
===================================================================
--- scummvm/trunk/engines/cruise/font.h 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/font.h 2007-05-30 14:38:17 UTC (rev 27011)
@@ -38,12 +38,12 @@
void flipGen(void *var, int32 length);
int32 getLineHeight(int16 charCount, uint8 * fontPtr, uint8 * fontPrt_Desc); // fontProc1
-int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, uint8 * ptr, uint8 * textString); // fontProc2
+int32 getTextLineCount(int32 rightBorder_X, int32 wordSpacingWidth, uint8 * ptr, const uint8 *textString); // fontProc2
void renderWord(uint8 * fontPtr_Data, uint8 * outBufferPtr,
int32 drawPosPixel_X, int32 heightOff, int32 height, int32 param4,
int32 stringRenderBufferSize, int32 width, int32 charWidth);
-gfxEntryStruct *renderText(int inRightBorder_X, uint8 * string);
+gfxEntryStruct *renderText(int inRightBorder_X, const uint8 *string);
void drawString(int32 x, int32 y, uint8 * string, uint8 * buffer, uint8 color,
int32 inRightBorder_X);
Modified: scummvm/trunk/engines/cruise/menu.cpp
===================================================================
--- scummvm/trunk/engines/cruise/menu.cpp 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/menu.cpp 2007-05-30 14:38:17 UTC (rev 27011)
@@ -39,7 +39,7 @@
entry->stringPtr = menuName;
entry->numElements = 0;
entry->ptrNextElement = NULL;
- entry->gfx = renderText(160, (uint8 *) menuName);
+ entry->gfx = renderText(160, (const uint8 *)menuName);
return entry;
}
@@ -117,7 +117,7 @@
pNewElement->next = NULL;
pNewElement->varC = 0;
pNewElement->color = color;
- pNewElement->gfx = renderText(160, (uint8 *) menuText);
+ pNewElement->gfx = renderText(160, (const uint8 *)menuText);
if (var_6 == NULL) {
pMenu->ptrNextElement = pNewElement;
Modified: scummvm/trunk/engines/cruise/overlay.cpp
===================================================================
--- scummvm/trunk/engines/cruise/overlay.cpp 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/overlay.cpp 2007-05-30 14:38:17 UTC (rev 27011)
@@ -42,7 +42,7 @@
numOfLoadedOverlay = 1;
}
-int loadOverlay(uint8 *scriptName) {
+int loadOverlay(const uint8 *scriptName) {
int newNumberOfScript;
bool scriptNotLoadedBefore;
int scriptIdx;
@@ -59,7 +59,7 @@
scriptNotLoadedBefore = false;
- scriptIdx = findOverlayByName((char *)scriptName);
+ scriptIdx = findOverlayByName((const char *)scriptName);
if (scriptIdx == -4) {
scriptIdx = numOfLoadedOverlay;
@@ -723,7 +723,7 @@
return 0;
}
-int32 findOverlayByName2(uint8 *name) {
+int32 findOverlayByName2(const uint8 *name) {
int i;
for (i = 1; i < numOfLoadedOverlay; i++) {
Modified: scummvm/trunk/engines/cruise/overlay.h
===================================================================
--- scummvm/trunk/engines/cruise/overlay.h 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/overlay.h 2007-05-30 14:38:17 UTC (rev 27011)
@@ -181,8 +181,8 @@
extern int numOfLoadedOverlay;
void initOverlayTable(void);
-int loadOverlay(uint8 * scriptName);
-int32 findOverlayByName2(uint8 * name);
+int loadOverlay(const uint8 * scriptName);
+int32 findOverlayByName2(const uint8 * name);
int findOverlayByName(const char *overlayName);
int releaseOverlay(const char *name);
Modified: scummvm/trunk/engines/cruise/stringSupport.cpp
===================================================================
--- scummvm/trunk/engines/cruise/stringSupport.cpp 2007-05-30 10:20:21 UTC (rev 27010)
+++ scummvm/trunk/engines/cruise/stringSupport.cpp 2007-05-30 14:38:17 UTC (rev 27011)
@@ -35,7 +35,7 @@
}
uint8 strcmpuint8(const void *string1, const void *string2) {
- return strcmp((char *)string1, (char *)string2);
+ return strcmp((const char *)string1, (const char *)string2);
}
} // End of namespace Cruise
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list