[Scummvm-cvs-logs] SF.net SVN: scummvm: [25095] scummvm/trunk/engines/parallaction
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Jan 15 22:14:35 CET 2007
Revision: 25095
http://scummvm.svn.sourceforge.net/scummvm/?rev=25095&view=rev
Author: fingolfin
Date: 2007-01-15 13:14:34 -0800 (Mon, 15 Jan 2007)
Log Message:
-----------
Fixing const related warnings in the parallaction engine
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/animation.cpp
scummvm/trunk/engines/parallaction/commands.cpp
scummvm/trunk/engines/parallaction/dialogue.cpp
scummvm/trunk/engines/parallaction/graphics.h
scummvm/trunk/engines/parallaction/location.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/staticres.cpp
scummvm/trunk/engines/parallaction/table.cpp
scummvm/trunk/engines/parallaction/zone.cpp
Modified: scummvm/trunk/engines/parallaction/animation.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/animation.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/animation.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -98,7 +98,7 @@
}
if (!scumm_stricmp(_tokens[0], "type")) {
if (_tokens[2][0] != '\0') {
- vD0->_zone._type = ((4 + searchTable(_tokens[2], _objectsNames)) << 16) & 0xFFFF0000;
+ vD0->_zone._type = ((4 + searchTable(_tokens[2], (const char **)_objectsNames)) << 16) & 0xFFFF0000;
}
int16 _si = searchTable(_tokens[1], _zoneTypeNames);
if (_si != -1) {
Modified: scummvm/trunk/engines/parallaction/commands.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/commands.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/commands.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -44,9 +44,7 @@
#define CMD_MOVE 15
#define CMD_STOP 16
-extern char *_callableNames[];
-
Command *parseCommands(ArchivedFile *file) {
// printf("parseCommands()\n");
@@ -70,9 +68,9 @@
case CMD_SET: // set
case CMD_CLEAR: // clear
case CMD_TOGGLE: // toggle
- if (_vm->searchTable(_tokens[1], _globalTable) == -1) {
+ if (_vm->searchTable(_tokens[1], (const char **)_globalTable) == -1) {
do {
- char _al = _vm->searchTable(_tokens[_si], _localFlagNames);
+ char _al = _vm->searchTable(_tokens[_si], (const char **)_localFlagNames);
_si++;
cmd->u._flags |= 1 << (_al - 1);
} while (!scumm_stricmp(_tokens[_si++], "|"));
@@ -80,7 +78,7 @@
} else {
cmd->u._flags |= kFlagsGlobal;
do {
- char _al = _vm->searchTable(_tokens[1], _globalTable);
+ char _al = _vm->searchTable(_tokens[1], (const char **)_globalTable);
_si++;
cmd->u._flags |= 1 << (_al - 1);
} while (!scumm_stricmp(_tokens[_si++], "|"));
@@ -121,7 +119,7 @@
break;
case CMD_DROP: // drop
- cmd->u._object = _vm->searchTable(_tokens[_si], _objectsNames);
+ cmd->u._object = _vm->searchTable(_tokens[_si], (const char **)_objectsNames);
_si++;
break;
@@ -148,10 +146,10 @@
cmd->_flagsOn |= kFlagsEnter;
} else
if (!scumm_strnicmp(_tokens[_si], "no", 2)) {
- byte _al = _vm->searchTable(&_tokens[_si][2], _localFlagNames);
+ byte _al = _vm->searchTable(&_tokens[_si][2], (const char **)_localFlagNames);
cmd->_flagsOff |= 1 << (_al - 1);
} else {
- byte _al = _vm->searchTable(_tokens[_si], _localFlagNames);
+ byte _al = _vm->searchTable(_tokens[_si], (const char **)_localFlagNames);
cmd->_flagsOn |= 1 << (_al - 1);
}
@@ -173,10 +171,10 @@
cmd->_flagsOn |= kFlagsEnter;
} else
if (!scumm_strnicmp(_tokens[_si], "no", 2)) {
- byte _al = _vm->searchTable(&_tokens[_si][2], _globalTable);
+ byte _al = _vm->searchTable(&_tokens[_si][2], (const char **)_globalTable);
cmd->_flagsOff |= 1 << (_al - 1);
} else {
- byte _al = _vm->searchTable(_tokens[_si], _localFlagNames);
+ byte _al = _vm->searchTable(_tokens[_si], (const char **)_localFlagNames);
cmd->_flagsOn |= 1 << (_al - 1);
}
Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -93,14 +93,14 @@
parseFillBuffers();
while (scumm_stricmp(_tokens[0], "endquestion")) { // parse answers
- char** v60 = _localFlagNames;
+ const char** v60 = (const char **)_localFlagNames;
uint16 v56 = 1;
if (_tokens[1][0]) {
if (!scumm_stricmp(_tokens[1], "global")) {
v56 = 2;
- v60 = _globalTable;
+ v60 = (const char **)_globalTable;
vB4->_yesFlags[_di] |= kFlagsGlobal;
}
@@ -149,7 +149,7 @@
for (uint16 v5A = 0; v5A < 5; v5A++) {
if (_questions[_si]->_answers[v5A] == 0) continue;
- int16 v58 = _vm->searchTable(_questions[_si]->_following._names[v5A], _questions_names);
+ int16 v58 = _vm->searchTable(_questions[_si]->_following._names[v5A], (const char **)_questions_names);
memFree(_questions[_si]->_following._names[v5A]);
if (v58 == -1) {
Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/graphics.h 2007-01-15 21:14:34 UTC (rev 25095)
@@ -151,7 +151,7 @@
static byte * _buffers[NUM_BUFFERS];
- static byte _mouseArrow[256];
+ static byte _mouseArrow[256];
static StaticCnv _mouseComposedArrow;
protected:
Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/location.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -150,7 +150,7 @@
_si = 1;
do {
- byte _al = searchTable(_tokens[_si], _localFlagNames);
+ byte _al = searchTable(_tokens[_si], (const char **)_localFlagNames);
_localFlags[_currentLocationIndex] |= 1 << (_al - 1);
_si++;
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -56,8 +56,10 @@
char *_locationEndComment = NULL;
uint32 _localFlags[120] = { 0 };
+static char tmp_visited_str[] = "visited";
+
char *_localFlagNames[32] = {
- "visited",
+ tmp_visited_str, // "visited",
0,
0,
0,
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2007-01-15 21:14:34 UTC (rev 25095)
@@ -114,13 +114,13 @@
extern char *_locationEndComment;
extern char *_objectsNames[];
-extern char *_zoneTypeNames[];
-extern char *_zoneFlagNames[];
+extern const char *_zoneTypeNames[];
+extern const char *_zoneFlagNames[];
extern char *_localFlagNames[];
-extern char *commands_names[];
+extern const char *commands_names[];
-extern char *_instructionNames[];
-extern char *_callableNames[];
+extern const char *_instructionNames[];
+extern const char *_callableNames[];
void waitUntilLeftClick();
@@ -216,9 +216,9 @@
void waitTime(uint32 t);
- void initTable(const char *path, char **table);
- void freeTable(char** table);
- int16 searchTable(const char *s, char **table);
+ static void initTable(const char *path, char **table);
+ static void freeTable(char** table);
+ static int16 searchTable(const char *s, const char **table);
void parseLocation(const char *filename);
void changeCursor(int32 index);
Modified: scummvm/trunk/engines/parallaction/staticres.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/staticres.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/staticres.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -47,7 +47,7 @@
//
// proportional font glyphs width
//
-byte _glyphWidths[126] = {
+const byte _glyphWidths[126] = {
0x04, 0x03, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x04, 0x04, 0x06, 0x06, 0x03, 0x05, 0x03, 0x05,
0x06, 0x06, 0x06, 0x06, 0x07, 0x06, 0x06, 0x06, 0x06, 0x06, 0x03, 0x03, 0x05, 0x04, 0x05, 0x05,
0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
@@ -58,7 +58,7 @@
0x05, 0x06, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x06, 0x05, 0x05, 0x05, 0x05
};
-char *_zoneFlagNames[] = {
+const char *_zoneFlagNames[] = {
"closed",
"active",
"remove",
@@ -73,7 +73,8 @@
"nowalk",
0
};
-char *_zoneTypeNames[] = {
+
+const char *_zoneTypeNames[] = {
"examine",
"door",
"get",
@@ -102,7 +103,7 @@
"GAME10"
};
-char *commands_names[] = {
+const char *commands_names[] = {
"set",
"clear",
"start",
@@ -122,7 +123,7 @@
0
};
-char *_instructionNames[] = {
+const char *_instructionNames[] = {
"on",
"off",
"x",
@@ -144,7 +145,7 @@
0
};
-char *_callableNames[] = {
+const char *_callableNames[] = {
"HBOff",
"Projector",
"StartIntro",
Modified: scummvm/trunk/engines/parallaction/table.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/table.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/table.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -114,7 +114,7 @@
}
-int16 Parallaction::searchTable(const char *s, char **table) {
+int16 Parallaction::searchTable(const char *s, const char **table) {
int16 count = 0;
Modified: scummvm/trunk/engines/parallaction/zone.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/zone.cpp 2007-01-15 20:46:06 UTC (rev 25094)
+++ scummvm/trunk/engines/parallaction/zone.cpp 2007-01-15 21:14:34 UTC (rev 25095)
@@ -86,7 +86,7 @@
}
if (!scumm_stricmp(_tokens[0], "type")) {
if (_tokens[2][0] != '\0') {
- z->_type = (4 + searchTable(_tokens[2], _objectsNames)) << 16;
+ z->_type = (4 + searchTable(_tokens[2], (const char **)_objectsNames)) << 16;
}
int16 _si = searchTable(_tokens[1], _zoneTypeNames);
if (_si != -1) {
@@ -307,19 +307,19 @@
}
if (!scumm_stricmp(_tokens[0], "icon")) {
- u->get->_icon = 4 + searchTable(_tokens[1], _objectsNames);
+ u->get->_icon = 4 + searchTable(_tokens[1], (const char **)_objectsNames);
}
break;
case kZoneMerge: // merge Zone init
if (!scumm_stricmp(_tokens[0], "obj1")) {
- u->merge->_obj1 = 4 + searchTable(_tokens[1], _objectsNames);
+ u->merge->_obj1 = 4 + searchTable(_tokens[1], (const char **)_objectsNames);
}
if (!scumm_stricmp(_tokens[0], "obj2")) {
- u->merge->_obj2 = 4 + searchTable(_tokens[1], _objectsNames);
+ u->merge->_obj2 = 4 + searchTable(_tokens[1], (const char **)_objectsNames);
}
if (!scumm_stricmp(_tokens[0], "newobj")) {
- u->merge->_obj3 = 4 + searchTable(_tokens[1], _objectsNames);
+ u->merge->_obj3 = 4 + searchTable(_tokens[1], (const char **)_objectsNames);
}
break;
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