aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-10-24 09:44:20 +0000
committerMax Horn2006-10-24 09:44:20 +0000
commit7889783cac08bf24ac6daa835bab7120033d88cd (patch)
tree5c683e68690b385fb7804307601fce99291ef401
parent920a5ac5f43dfe76283d55e3eb285a87c2c44b2a (diff)
downloadscummvm-rg350-7889783cac08bf24ac6daa835bab7120033d88cd.tar.gz
scummvm-rg350-7889783cac08bf24ac6daa835bab7120033d88cd.tar.bz2
scummvm-rg350-7889783cac08bf24ac6daa835bab7120033d88cd.zip
const correctness
svn-id: r24488
-rw-r--r--common/advancedDetector.cpp2
-rw-r--r--common/advancedDetector.h4
-rw-r--r--engines/agos/game.cpp4
-rw-r--r--engines/cine/detection.cpp4
-rw-r--r--engines/saga/game.cpp4
-rw-r--r--engines/scumm/dialogs.cpp4
6 files changed, 11 insertions, 11 deletions
diff --git a/common/advancedDetector.cpp b/common/advancedDetector.cpp
index 4736cfc8bb..9f5fea7fec 100644
--- a/common/advancedDetector.cpp
+++ b/common/advancedDetector.cpp
@@ -36,7 +36,7 @@ AdvancedDetector::AdvancedDetector() {
String AdvancedDetector::getDescription(int num) {
char tmp[256];
- ADGameDescription *g = _gameDescriptions[num];
+ const ADGameDescription *g = _gameDescriptions[num];
snprintf(tmp, 256, "%s (%s %s/%s)", g->name, g->extra,
getPlatformDescription(g->platform), getLanguageDescription(g->language));
diff --git a/common/advancedDetector.h b/common/advancedDetector.h
index f89df2e971..c800a34db5 100644
--- a/common/advancedDetector.h
+++ b/common/advancedDetector.h
@@ -42,7 +42,7 @@ struct ADGameDescription {
};
typedef Array<int> ADList;
-typedef Array<ADGameDescription*> ADGameDescList;
+typedef Array<const ADGameDescription*> ADGameDescList;
class AdvancedDetector {
@@ -51,7 +51,7 @@ public:
~AdvancedDetector() {};
- void registerGameDescriptions(Array<ADGameDescription*> gameDescriptions) {
+ void registerGameDescriptions(ADGameDescList gameDescriptions) {
_gameDescriptions = gameDescriptions;
}
diff --git a/engines/agos/game.cpp b/engines/agos/game.cpp
index d393f8e95e..9cf545f5b9 100644
--- a/engines/agos/game.cpp
+++ b/engines/agos/game.cpp
@@ -205,7 +205,7 @@ bool AGOSEngine::initGame() {
// over again...
for (int i = 0; i < ARRAYSIZE(gameDescriptions); i++)
- descList.push_back((ADGameDescription *)&gameDescriptions[i]);
+ descList.push_back((const ADGameDescription *)&gameDescriptions[i]);
AdvDetector.registerGameDescriptions(descList);
AdvDetector.setFileMD5Bytes(FILE_MD5_BYTES);
@@ -239,7 +239,7 @@ DetectedGameList GAME_detectGames(const FSList &fslist) {
Common::ADGameDescList descList;
for (int i = 0; i < ARRAYSIZE(gameDescriptions); i++)
- descList.push_back((ADGameDescription *)&gameDescriptions[i]);
+ descList.push_back((const ADGameDescription *)&gameDescriptions[i]);
AdvDetector.registerGameDescriptions(descList);
AdvDetector.setFileMD5Bytes(FILE_MD5_BYTES);
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 7a601f37b3..4bda1d9991 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -662,7 +662,7 @@ bool CineEngine::initGame() {
// over again...
for (int i = 0; i < ARRAYSIZE(gameDescriptions); i++)
- descList.push_back((ADGameDescription *)&gameDescriptions[i]);
+ descList.push_back((const ADGameDescription *)&gameDescriptions[i]);
AdvDetector.registerGameDescriptions(descList);
AdvDetector.setFileMD5Bytes(FILE_MD5_BYTES);
@@ -696,7 +696,7 @@ DetectedGameList GAME_detectGames(const FSList &fslist) {
Common::ADGameDescList descList;
for (int i = 0; i < ARRAYSIZE(gameDescriptions); i++)
- descList.push_back((ADGameDescription *)&gameDescriptions[i]);
+ descList.push_back((const ADGameDescription *)&gameDescriptions[i]);
AdvDetector.registerGameDescriptions(descList);
AdvDetector.setFileMD5Bytes(FILE_MD5_BYTES);
diff --git a/engines/saga/game.cpp b/engines/saga/game.cpp
index 4c9fd608f8..f3f8e1629f 100644
--- a/engines/saga/game.cpp
+++ b/engines/saga/game.cpp
@@ -136,7 +136,7 @@ bool SagaEngine::initGame() {
for (int i = 0; i < ARRAYSIZE(gameDescriptions); i++)
- descList.push_back((ADGameDescription *)&gameDescriptions[i]);
+ descList.push_back((const ADGameDescription *)&gameDescriptions[i]);
AdvDetector.registerGameDescriptions(descList);
AdvDetector.setFileMD5Bytes(FILE_MD5_BYTES);
@@ -181,7 +181,7 @@ DetectedGameList GAME_detectGames(const FSList &fslist) {
Common::ADGameDescList descList;
for (int i = 0; i < ARRAYSIZE(gameDescriptions); i++)
- descList.push_back((ADGameDescription *)&gameDescriptions[i]);
+ descList.push_back((const ADGameDescription *)&gameDescriptions[i]);
AdvDetector.registerGameDescriptions(descList);
AdvDetector.setFileMD5Bytes(FILE_MD5_BYTES);
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 4c9ad26789..a95aeacdad 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -778,13 +778,13 @@ void InfoDialog::reflowLayout() {
const Common::String InfoDialog::queryResString(int stringno) {
byte buf[256];
- byte *result;
+ const byte *result;
if (stringno == 0)
return String();
if (_vm->_game.version == 8)
- result = (byte *)string_map_table_v8[stringno - 1].string;
+ result = (const byte *)string_map_table_v8[stringno - 1].string;
else if (_vm->_game.version == 7)
result = _vm->getStringAddressVar(string_map_table_v7[stringno - 1].num);
else if (_vm->_game.version == 6)