[Scummvm-git-logs] scummvm master -> 62b181b6285f5f8bf0bdcc4878414e6a74a17591
mduggan
mgithub at guarana.org
Fri Mar 5 11:46:24 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
346d1800a5 PRIVATE: Make some things static to reduce exported symbols
62b181b628 PRIVATE: Const correctness for iterators
Commit: 346d1800a5cc3b28da37c0905f8c02af85e9650d
https://github.com/scummvm/scummvm/commit/346d1800a5cc3b28da37c0905f8c02af85e9650d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-03-05T19:30:07+09:00
Commit Message:
PRIVATE: Make some things static to reduce exported symbols
Changed paths:
engines/private/cursors.cpp
engines/private/funcs.cpp
engines/private/private.h
engines/private/symbol.cpp
diff --git a/engines/private/cursors.cpp b/engines/private/cursors.cpp
index 405dd79e3b..4094fd9615 100644
--- a/engines/private/cursors.cpp
+++ b/engines/private/cursors.cpp
@@ -28,7 +28,7 @@
namespace Private {
-const byte MOUSECURSOR_SCI[] = {
+static const byte MOUSECURSOR_SCI[] = {
1,1,0,0,0,0,0,0,0,0,0,
1,2,1,0,0,0,0,0,0,0,0,
1,2,2,1,0,0,0,0,0,0,0,
@@ -47,7 +47,7 @@ const byte MOUSECURSOR_SCI[] = {
0,0,0,0,0,0,1,2,2,1,0
};
-extern const byte MOUSECURSOR_kExit[] = {
+static const byte MOUSECURSOR_kExit[] = {
0,0,0,0,0,0,0,0,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,1,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -82,7 +82,7 @@ extern const byte MOUSECURSOR_kExit[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
-const byte MOUSECURSOR_kZoomIn[] = {
+static const byte MOUSECURSOR_kZoomIn[] = {
0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,1,1,1,2,2,2,2,2,2,2,2,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,1,1,2,2,2,2,1,1,1,1,1,2,2,2,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -117,7 +117,7 @@ const byte MOUSECURSOR_kZoomIn[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
-const byte MOUSECURSOR_kTurnRight[] = {
+static const byte MOUSECURSOR_kTurnRight[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -152,7 +152,7 @@ const byte MOUSECURSOR_kTurnRight[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
-const byte MOUSECURSOR_kTurnLeft[] = {
+static const byte MOUSECURSOR_kTurnLeft[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -187,7 +187,7 @@ const byte MOUSECURSOR_kTurnLeft[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
-const byte MOUSECURSOR_kInventory[] = {
+static const byte MOUSECURSOR_kInventory[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,3,3,1,1,1,0,0,0,0,0,0,0,0,0,0,0,
@@ -222,7 +222,7 @@ const byte MOUSECURSOR_kInventory[] = {
0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
};
-const byte MOUSECURSOR_kZoomOut[] = {
+static const byte MOUSECURSOR_kZoomOut[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,1,2,2,2,2,2,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -257,7 +257,7 @@ const byte MOUSECURSOR_kZoomOut[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
-const byte MOUSECURSOR_kPhone[] = {
+static const byte MOUSECURSOR_kPhone[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -292,7 +292,7 @@ const byte MOUSECURSOR_kPhone[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
};
-extern const byte cursorPalette[] = {
+static const byte cursorPalette[] = {
0, 0, 0, // Black / Transparent
0x01, 0x01, 0x01, // Gray
0xff, 0xff, 0xff, // White
@@ -329,8 +329,8 @@ static struct CursorPointTable {
{ 0, {0, 0} }
};
-CursorDataMap _cursorData;
-CursorPointMap _cursorPoints;
+static CursorDataMap _cursorData;
+static CursorPointMap _cursorPoints;
void PrivateEngine::initCursors() {
for (Private::CursorDataTable *cur = Private::cursorDataTable; cur->name; cur++) {
diff --git a/engines/private/funcs.cpp b/engines/private/funcs.cpp
index 017dfef517..802b901e24 100644
--- a/engines/private/funcs.cpp
+++ b/engines/private/funcs.cpp
@@ -30,7 +30,7 @@
namespace Private {
-void fChgMode(ArgArray args) {
+static void fChgMode(ArgArray args) {
// assert types
assert (args.size() == 2 || args.size() == 3);
if (args.size() == 2)
@@ -61,14 +61,14 @@ void fChgMode(ArgArray args) {
}
}
-void fVSPicture(ArgArray args) {
+static void fVSPicture(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "VSPicture(%s)", args[0].u.str);
g_private->_nextVS = args[0].u.str;
}
-void fDiaryLocList(ArgArray args) {
+static void fDiaryLocList(ArgArray args) {
int x1, y1, x2, y2;
debugC(1, kPrivateDebugScript, "DiaryLocList(%d, %d, %d, %d)", args[0].u.val, args[1].u.val, args[2].u.val, args[3].u.val);
@@ -84,11 +84,11 @@ void fDiaryLocList(ArgArray args) {
}
-void fDiaryGoLoc(ArgArray args) {
+static void fDiaryGoLoc(ArgArray args) {
debugC(1, kPrivateDebugScript, "WARNING: DiaryGoLoc not implemented");
}
-void fDiaryInvList(ArgArray args) {
+static void fDiaryInvList(ArgArray args) {
debugC(1, kPrivateDebugScript, "DiaryInvList(%d, ..)", args[0].u.val);
const Common::Rect *r1 = args[1].u.rect;
@@ -97,14 +97,14 @@ void fDiaryInvList(ArgArray args) {
g_private->loadInventory(args[0].u.val, *r1, *r2);
}
-void fgoto(ArgArray args) {
+static void fgoto(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "goto(%s)", args[0].u.str);
g_private->_nextSetting = args[0].u.str;
}
-void fSyncSound(ArgArray args) {
+static void fSyncSound(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "SyncSound(%s, %s)", args[0].u.str, args[1].u.str);
g_private->_nextSetting = args[1].u.str;
@@ -115,12 +115,12 @@ void fSyncSound(ArgArray args) {
}
}
-void fQuit(ArgArray args) {
+static void fQuit(ArgArray args) {
debugC(1, kPrivateDebugScript, "Quit()");
g_private->quitGame();
}
-void fLoadGame(ArgArray args) {
+static void fLoadGame(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "LoadGame(%s, %s)", args[0].u.str, args[2].u.sym->name->c_str());
MaskInfo m;
@@ -136,7 +136,7 @@ void fLoadGame(ArgArray args) {
g_private->_masks.push_front(m);
}
-void fSaveGame(ArgArray args) {
+static void fSaveGame(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "SaveGame(%s, %s)", args[0].u.str, args[1].u.sym->name->c_str());
MaskInfo m;
@@ -152,12 +152,12 @@ void fSaveGame(ArgArray args) {
g_private->_masks.push_front(m);
}
-void fRestartGame(ArgArray args) {
+static void fRestartGame(ArgArray args) {
assert(args.size() == 0);
g_private->restartGame();
}
-void fPoliceBust(ArgArray args) {
+static void fPoliceBust(ArgArray args) {
// assert types
assert (args.size() == 1 || args.size() == 2);
g_private->_policeBustEnabled = args[0].u.val;
@@ -180,7 +180,7 @@ void fPoliceBust(ArgArray args) {
debugC(1, kPrivateDebugScript, "WARNING: PoliceBust partially implemented");
}
-void fBustMovie(ArgArray args) {
+static void fBustMovie(ArgArray args) {
// assert types
assert (args.size() == 1);
debugC(1, kPrivateDebugScript, "BustMovie(%s)", args[0].u.str);
@@ -202,7 +202,7 @@ void fBustMovie(ArgArray args) {
g_private->_nextSetting = args[0].u.str;
}
-void fDossierAdd(ArgArray args) {
+static void fDossierAdd(ArgArray args) {
assert (args.size() == 2);
Common::String s1 = args[0].u.str;
@@ -219,7 +219,7 @@ void fDossierAdd(ArgArray args) {
g_private->_dossiers.push_back(m);
}
-void fDossierBitmap(ArgArray args) {
+static void fDossierBitmap(ArgArray args) {
assert (args.size() == 2);
int x = args[0].u.val;
int y = args[1].u.val;
@@ -227,11 +227,11 @@ void fDossierBitmap(ArgArray args) {
g_private->loadDossier();
}
-void fDossierChgSheet(ArgArray args) {
+static void fDossierChgSheet(ArgArray args) {
debugC(1, kPrivateDebugScript, "WARNING: DossierChgSheet is not implemented");
}
-void fDossierPrevSuspect(ArgArray args) {
+static void fDossierPrevSuspect(ArgArray args) {
assert (args.size() == 3);
Common::String s(args[0].u.str);
MaskInfo m;
@@ -248,7 +248,7 @@ void fDossierPrevSuspect(ArgArray args) {
g_private->_masks.push_front(m);
}
-void fDossierNextSuspect(ArgArray args) {
+static void fDossierNextSuspect(ArgArray args) {
assert (args.size() == 3);
Common::String s(args[0].u.str);
MaskInfo m;
@@ -265,19 +265,19 @@ void fDossierNextSuspect(ArgArray args) {
g_private->_masks.push_front(m);
}
-void fNoStopSounds(ArgArray args) {
+static void fNoStopSounds(ArgArray args) {
assert(args.size() == 0);
debugC(1, kPrivateDebugScript, "NoStopSounds()");
g_private->_noStopSounds = true;
}
-void fLoseInventory(ArgArray args) {
+static void fLoseInventory(ArgArray args) {
assert(args.size() == 0);
debugC(1, kPrivateDebugScript, "LoveInventory()");
g_private->inventory.clear();
}
-void fInventory(ArgArray args) {
+static void fInventory(ArgArray args) {
// assert types
Datum b1 = args[0];
Datum v1 = args[1];
@@ -351,14 +351,14 @@ void fInventory(ArgArray args) {
}
}
-void fSetFlag(ArgArray args) {
+static void fSetFlag(ArgArray args) {
assert(args.size() == 2);
assert(args[0].type == NAME && args[1].type == NUM);
debugC(1, kPrivateDebugScript, "SetFlag(%s, %d)", args[0].u.sym->name->c_str(), args[1].u.val);
args[0].u.sym->u.val = args[1].u.val;
}
-void fExit(ArgArray args) {
+static void fExit(ArgArray args) {
// assert types
assert(args[2].type == RECT || args[2].type == NAME);
debugC(1, kPrivateDebugScript, "Exit(%d %d %d)", args[0].type, args[1].type, args[2].type); //, args[0].u.str, args[1].u.sym->name->c_str(), "RECT");
@@ -383,19 +383,19 @@ void fExit(ArgArray args) {
g_private->_exits.push_front(e);
}
-void fSetModifiedFlag(ArgArray args) {
+static void fSetModifiedFlag(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "SetModifiedFlag(%d)", args[0].u.val);
g_private->_modified = args[0].u.val != 0;
}
-void fPaperShuffleSound(ArgArray args) {
+static void fPaperShuffleSound(ArgArray args) {
assert(args.size() == 0);
debugC(1, kPrivateDebugScript, "PaperShuffleSound()");
g_private->playSound(g_private->getPaperShuffleSound(), 1, false, false);
}
-void fSoundEffect(ArgArray args) {
+static void fSoundEffect(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "SoundEffect(%s)", args[0].u.str);
Common::String s(args[0].u.str);
@@ -406,7 +406,7 @@ void fSoundEffect(ArgArray args) {
}
}
-void fSound(ArgArray args) {
+static void fSound(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "Sound(%s)", args[0].u.str);
if (args.size() == 4) {
@@ -430,7 +430,7 @@ void fSound(ArgArray args) {
}
}
-void fLoopedSound(ArgArray args) {
+static void fLoopedSound(ArgArray args) {
// assert types
assert(args.size() == 1);
debugC(1, kPrivateDebugScript, "LoopedSound(%s)", args[0].u.str);
@@ -443,19 +443,19 @@ void fLoopedSound(ArgArray args) {
}
}
-void fViewScreen(ArgArray args) {
+static void fViewScreen(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "WARNING: ViewScreen not implemented!");
}
-void fTransition(ArgArray args) {
+static void fTransition(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "Transition(%s, %s)", args[0].u.str, args[1].u.str);
g_private->_nextMovie = args[0].u.str;
g_private->_nextSetting = args[1].u.str;
}
-void fResume(ArgArray args) {
+static void fResume(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "Resume(%d)", args[0].u.val); // this value is always 1
g_private->_nextSetting = g_private->_pausedSetting;
@@ -464,7 +464,7 @@ void fResume(ArgArray args) {
g_private->_origin = Common::Point(kOriginOne[0], kOriginOne[1]);
}
-void fMovie(ArgArray args) {
+static void fMovie(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "Movie(%s, %s)", args[0].u.str, args[1].u.str);
Common::String movie = args[0].u.str;
@@ -483,7 +483,7 @@ void fMovie(ArgArray args) {
}
}
-void fCRect(ArgArray args) {
+static void fCRect(ArgArray args) {
// assert types
debugC(1, kPrivateDebugScript, "CRect(%d, %d, %d, %d)", args[0].u.val, args[1].u.val, args[2].u.val, args[3].u.val);
int x1, y1, x2, y2;
@@ -499,7 +499,7 @@ void fCRect(ArgArray args) {
Gen::push(*d);
}
-void fBitmap(ArgArray args) {
+static void fBitmap(ArgArray args) {
assert(args.size() == 1 || args.size() == 3);
int x = 0;
@@ -516,7 +516,7 @@ void fBitmap(ArgArray args) {
g_private->loadImage(s, x, y);
}
-void _fMask(ArgArray args, bool drawn) {
+static void _fMask(ArgArray args, bool drawn) {
assert(args.size() == 3 || args.size() == 5);
int x = 0;
@@ -544,10 +544,10 @@ void _fMask(ArgArray args, bool drawn) {
}
-void fMask(ArgArray args) {
+static void fMask(ArgArray args) {
_fMask(args, false);
}
-void fMaskDrawn(ArgArray args) {
+static void fMaskDrawn(ArgArray args) {
_fMask(args, true);
}
@@ -576,17 +576,17 @@ static void fAddSound(Common::String sound, const char *t, Symbol *flag = NULL,
error("error: invalid sound type %s", t);
}
-void fAMRadioClip(ArgArray args) {
+static void fAMRadioClip(ArgArray args) {
assert(args.size() <= 4);
fAddSound(args[0].u.str, "AMRadioClip");
}
-void fPoliceClip(ArgArray args) {
+static void fPoliceClip(ArgArray args) {
assert(args.size() <= 4);
fAddSound(args[0].u.str, "PoliceClip");
}
-void fPhoneClip(ArgArray args) {
+static void fPhoneClip(ArgArray args) {
if (args.size() == 2) {
debugC(1, kPrivateDebugScript, "Unimplemented PhoneClip special case");
return;
@@ -603,7 +603,7 @@ void fPhoneClip(ArgArray args) {
}
}
-void fSoundArea(ArgArray args) {
+static void fSoundArea(ArgArray args) {
// assert types
//char *n;
Common::String n;
@@ -653,17 +653,17 @@ void fSoundArea(ArgArray args) {
}
}
-void fSafeDigit(ArgArray args) {
+static void fSafeDigit(ArgArray args) {
debugC(1, kPrivateDebugScript, "WARNING: SafeDigit is not implemented");
}
-void fAskSave(ArgArray args) {
+static void fAskSave(ArgArray args) {
// This is not needed, since scummvm will take care of this
debugC(1, kPrivateDebugScript, "WARNING: AskSave is partially implemented");
g_private->_nextSetting = args[0].u.str;
}
-void fTimer(ArgArray args) {
+static void fTimer(ArgArray args) {
assert (args.size() == 2 || args.size() == 3);
if (args.size() == 3)
@@ -683,7 +683,7 @@ void fTimer(ArgArray args) {
}
}
-FuncTable funcTable[] = {
+const FuncTable funcTable[] = {
// Control flow
{ fChgMode, "ChgMode"},
diff --git a/engines/private/private.h b/engines/private/private.h
index a962c00d39..ca34cafdc4 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -123,7 +123,7 @@ typedef struct FuncTable {
} FunctTable;
typedef Common::HashMap<Common::String, void *> NameToPtr;
-extern FuncTable funcTable[];
+extern const FuncTable funcTable[];
// lists
diff --git a/engines/private/symbol.cpp b/engines/private/symbol.cpp
index a86f8496c6..4952f6f266 100644
--- a/engines/private/symbol.cpp
+++ b/engines/private/symbol.cpp
@@ -57,7 +57,8 @@ void SymbolMaps::defineSymbol(const char *n, Common::Rect *r) {
rectToDefine.push(r);
}
-void showSymbol(Symbol *s) {
+/*
+static void showSymbol(const Symbol *s) {
if (s->type == NUM)
debugC(1, kPrivateDebugCode, "%s %d",s->name->c_str(), s->u.val);
else if (s->type == STRING)
@@ -67,13 +68,14 @@ void showSymbol(Symbol *s) {
else
debugC(1, kPrivateDebugCode, "%s %d", s->name->c_str(), s->type);
}
+*/
void setSymbol(Symbol *s, int v) {
s->u.val = v;
}
/* find s in symbol table symlist */
-Symbol *lookup(const Common::String &s, SymbolMap symlist) {
+static Symbol *lookup(const Common::String &s, SymbolMap symlist) {
Symbol *r = symlist.getVal(s);
return r;
}
Commit: 62b181b6285f5f8bf0bdcc4878414e6a74a17591
https://github.com/scummvm/scummvm/commit/62b181b6285f5f8bf0bdcc4878414e6a74a17591
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-03-05T19:30:58+09:00
Commit Message:
PRIVATE: Const correctness for iterators
Changed paths:
engines/private/private.cpp
diff --git a/engines/private/private.cpp b/engines/private/private.cpp
index 0798ddf409..154bdd90ca 100644
--- a/engines/private/private.cpp
+++ b/engines/private/private.cpp
@@ -292,7 +292,7 @@ Common::Error PrivateEngine::run() {
}
void PrivateEngine::initFuncs() {
- for (Private::FuncTable *fnc = funcTable; fnc->name; fnc++) {
+ for (const Private::FuncTable *fnc = funcTable; fnc->name; fnc++) {
Common::String name(fnc->name);
_functions.setVal(name, (void *)fnc->func);
}
@@ -388,7 +388,7 @@ bool PrivateEngine::cursorExit(Common::Point mousePos) {
int cs = 0;
Common::String cursor;
- for (ExitList::iterator it = _exits.begin(); it != _exits.end(); ++it) {
+ for (ExitList::const_iterator it = _exits.begin(); it != _exits.end(); ++it) {
const ExitInfo &e = *it;
cs = e.rect.width()*e.rect.height();
@@ -425,7 +425,7 @@ bool PrivateEngine::inMask(Graphics::ManagedSurface *surf, Common::Point mousePo
bool PrivateEngine::cursorMask(Common::Point mousePos) {
bool inside = false;
- for (MaskList::iterator it = _masks.begin(); it != _masks.end(); ++it) {
+ for (MaskList::const_iterator it = _masks.begin(); it != _masks.end(); ++it) {
const MaskInfo &m = *it;
if (inMask(m.surf, mousePos)) {
@@ -469,7 +469,7 @@ void PrivateEngine::selectExit(Common::Point mousePos) {
Common::String ns = "";
int rs = 100000000;
int cs = 0;
- for (ExitList::iterator it = _exits.begin(); it != _exits.end(); ++it) {
+ for (ExitList::const_iterator it = _exits.begin(); it != _exits.end(); ++it) {
const ExitInfo &e = *it;
cs = e.rect.width()*e.rect.height();
//debug("Testing exit %s %d", e.nextSetting->c_str(), cs);
@@ -495,7 +495,7 @@ void PrivateEngine::selectExit(Common::Point mousePos) {
void PrivateEngine::selectMask(Common::Point mousePos) {
Common::String ns;
- for (MaskList::iterator it = _masks.begin(); it != _masks.end(); ++it) {
+ for (MaskList::const_iterator it = _masks.begin(); it != _masks.end(); ++it) {
const MaskInfo &m = *it;
//debug("Testing mask %s", m.nextSetting->c_str());
if (inMask(m.surf, mousePos)) {
@@ -766,26 +766,26 @@ Common::Error PrivateEngine::saveGameStream(Common::WriteStream *stream, bool is
return Common::kNoError;
// Variables
- for (NameList::iterator it = maps.variableList.begin(); it != maps.variableList.end(); ++it) {
- Private::Symbol *sym = maps.variables.getVal(*it);
+ for (NameList::const_iterator it = maps.variableList.begin(); it != maps.variableList.end(); ++it) {
+ const Private::Symbol *sym = maps.variables.getVal(*it);
stream->writeUint32LE(sym->u.val);
}
// Diary
- for (NameList::iterator it = maps.locationList.begin(); it != maps.locationList.end(); ++it) {
- Private::Symbol *sym = maps.locations.getVal(*it);
+ for (NameList::const_iterator it = maps.locationList.begin(); it != maps.locationList.end(); ++it) {
+ const Private::Symbol *sym = maps.locations.getVal(*it);
stream->writeUint32LE(sym->u.val);
}
stream->writeUint32LE(inventory.size());
- for (NameList::iterator it = inventory.begin(); it != inventory.end(); ++it) {
+ for (NameList::const_iterator it = inventory.begin(); it != inventory.end(); ++it) {
stream->writeString(*it);
stream->writeByte(0);
}
// Dossiers
stream->writeUint32LE(_dossiers.size());
- for (DossierArray::iterator it = _dossiers.begin(); it != _dossiers.end(); ++it) {
+ for (DossierArray::const_iterator it = _dossiers.begin(); it != _dossiers.end(); ++it) {
stream->writeString(it->page1.c_str());
stream->writeByte(0);
@@ -796,18 +796,18 @@ Common::Error PrivateEngine::saveGameStream(Common::WriteStream *stream, bool is
// Radios
stream->writeUint32LE(_AMRadio.size());
- for (SoundList::iterator it = _AMRadio.begin(); it != _AMRadio.end(); ++it) {
+ for (SoundList::const_iterator it = _AMRadio.begin(); it != _AMRadio.end(); ++it) {
stream->writeString(*it);
stream->writeByte(0);
}
stream->writeUint32LE(_policeRadio.size());
- for (SoundList::iterator it = _policeRadio.begin(); it != _policeRadio.end(); ++it) {
+ for (SoundList::const_iterator it = _policeRadio.begin(); it != _policeRadio.end(); ++it) {
stream->writeString(*it);
stream->writeByte(0);
}
stream->writeUint32LE(_phone.size());
- for (PhoneList::iterator it = _phone.begin(); it != _phone.end(); ++it) {
+ for (PhoneList::const_iterator it = _phone.begin(); it != _phone.end(); ++it) {
stream->writeString(it->sound);
stream->writeByte(0);
stream->writeString(*it->flag->name);
@@ -820,13 +820,13 @@ Common::Error PrivateEngine::saveGameStream(Common::WriteStream *stream, bool is
stream->writeByte(0);
stream->writeUint32LE(_playedMovies.size());
- for (PlayedMediaTable::iterator it = _playedMovies.begin(); it != _playedMovies.end(); ++it) {
+ for (PlayedMediaTable::const_iterator it = _playedMovies.begin(); it != _playedMovies.end(); ++it) {
stream->writeString(it->_key);
stream->writeByte(0);
}
stream->writeUint32LE(_playedPhoneClips.size());
- for (PlayedMediaTable::iterator it = _playedPhoneClips.begin(); it != _playedPhoneClips.end(); ++it) {
+ for (PlayedMediaTable::const_iterator it = _playedPhoneClips.begin(); it != _playedPhoneClips.end(); ++it) {
stream->writeString(it->_key);
stream->writeByte(0);
}
@@ -1031,7 +1031,7 @@ Common::String PrivateEngine::getRandomPhoneClip(const char *clip, int i, int j)
}
// Timers
-void timerCallback(void *refCon) {
+static void timerCallback(void *refCon) {
g_private->removeTimer();
g_private->_nextSetting = *(Common::String *)refCon;
}
@@ -1049,8 +1049,8 @@ void PrivateEngine::removeTimer() {
void PrivateEngine::loadLocations(const Common::Rect &rect) {
uint32 i = 0;
int16 offset = 44;
- for (NameList::iterator it = maps.locationList.begin(); it != maps.locationList.end(); ++it) {
- Private::Symbol *sym = maps.locations.getVal(*it);
+ for (NameList::const_iterator it = maps.locationList.begin(); it != maps.locationList.end(); ++it) {
+ const Private::Symbol *sym = maps.locations.getVal(*it);
i++;
if (sym->u.val) {
offset = offset + 22;
@@ -1064,7 +1064,7 @@ void PrivateEngine::loadLocations(const Common::Rect &rect) {
void PrivateEngine::loadInventory(uint32 x, const Common::Rect &r1, const Common::Rect &r2) {
int16 offset = 0;
- for (NameList::iterator it = inventory.begin(); it != inventory.end(); ++it) {
+ for (NameList::const_iterator it = inventory.begin(); it != inventory.end(); ++it) {
offset = offset + 22;
//debug("%hd %hd", rect->left, rect->top + offset);
loadMask(*it, r1.left, r1.top + offset, true);
More information about the Scummvm-git-logs
mailing list