aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects/pages
diff options
context:
space:
mode:
authorwhiterandrek2018-05-21 14:27:29 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commita45e58319d7aa6da38f4ecee3ca07889a75d3a82 (patch)
treec6fee74bb9430e44c822e12ec52bc1d1866802a3 /engines/pink/objects/pages
parent656ca285ac7ac6f365fdde45accb020b80ec7898 (diff)
downloadscummvm-rg350-a45e58319d7aa6da38f4ecee3ca07889a75d3a82.tar.gz
scummvm-rg350-a45e58319d7aa6da38f4ecee3ca07889a75d3a82.tar.bz2
scummvm-rg350-a45e58319d7aa6da38f4ecee3ca07889a75d3a82.zip
PINK: fix signed vs unsigned comparison
Diffstat (limited to 'engines/pink/objects/pages')
-rw-r--r--engines/pink/objects/pages/game_page.cpp10
-rw-r--r--engines/pink/objects/pages/page.cpp10
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp
index 2ac88fbfdf..bdfb92bef6 100644
--- a/engines/pink/objects/pages/game_page.cpp
+++ b/engines/pink/objects/pages/game_page.cpp
@@ -43,7 +43,7 @@ void GamePage::toConsole() {
Page::toConsole();
_walkMgr->toConsole();
_sequencer->toConsole();
- for (int i = 0; i < _handlers.size(); ++i) {
+ for (uint i = 0; i < _handlers.size(); ++i) {
_handlers[i]->toConsole();
}
}
@@ -74,7 +74,7 @@ void GamePage::init(bool isLoadingSave) {
toConsole();
- for (int j = 0; j < _actors.size(); ++j) {
+ for (uint j = 0; j < _actors.size(); ++j) {
if (_actors[j]->initPallete(_module->getGame()->getDirector()))
break;
}
@@ -82,7 +82,7 @@ void GamePage::init(bool isLoadingSave) {
LeadActor::State state = _leadActor->getState();
bool startNow = !(state == LeadActor::kInventory || state == LeadActor::kPDA);
- for (int i = 0; i < _actors.size(); ++i) {
+ for (uint i = 0; i < _actors.size(); ++i) {
_actors[i]->init(startNow);
}
@@ -173,7 +173,7 @@ void GamePage::saveState() {
archive << _variables;
archive.writeWORD(_actors.size());
- for (int i = 0; i < _actors.size(); ++i) {
+ for (uint i = 0; i < _actors.size(); ++i) {
archive.writeString(_actors[i]->getName());
_actors[i]->saveState(archive);
}
@@ -193,7 +193,7 @@ void GamePage::clear() {
Page::clear();
//_variables.clear(1);
- for (int i = 0; i < _handlers.size(); ++i) {
+ for (uint i = 0; i < _handlers.size(); ++i) {
delete _handlers[i];
}
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
index 9c923e2ebb..cf2d3a01be 100644
--- a/engines/pink/objects/pages/page.cpp
+++ b/engines/pink/objects/pages/page.cpp
@@ -57,7 +57,7 @@ CelDecoder *Page::loadCel(Common::String &fileName) {
void Page::toConsole() {
- for (int i = 0; i < _actors.size(); ++i) {
+ for (uint i = 0; i < _actors.size(); ++i) {
_actors[i]->toConsole();
}
}
@@ -66,7 +66,7 @@ void Page::init() {
LeadActor::State state = _leadActor->getState();
bool unk = (state == LeadActor::kInventory || state == LeadActor::kPDA);
- for (int i = 0; i < _actors.size(); ++i) {
+ for (uint i = 0; i < _actors.size(); ++i) {
_actors[i]->init(unk);
}
}
@@ -76,7 +76,7 @@ LeadActor *Page::getLeadActor() {
}
void Page::clear() {
- for (int i = 0; i < _actors.size(); ++i) {
+ for (uint i = 0; i < _actors.size(); ++i) {
delete _actors[i];
}
_actors.clear();
@@ -84,13 +84,13 @@ void Page::clear() {
}
void Page::pause() {
- for (int i = 0; i < _actors.size(); ++i) {
+ for (uint i = 0; i < _actors.size(); ++i) {
_actors[i]->pause();
}
}
void Page::unpause() {
- for (int i = 0; i < _actors.size(); ++i) {
+ for (uint i = 0; i < _actors.size(); ++i) {
_actors[i]->unpause();
}
}