aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-07-18 00:12:53 +0200
committeruruk2014-07-18 00:12:53 +0200
commitc285d3299c2c87f6d5c6279e7ebcb65274024b9b (patch)
treeed1c0a7e28be98b6327d0be3e2493a4c93b79c57
parentf3345f296f992ec2766fe9e9687f9997b0c34c6f (diff)
downloadscummvm-rg350-c285d3299c2c87f6d5c6279e7ebcb65274024b9b.tar.gz
scummvm-rg350-c285d3299c2c87f6d5c6279e7ebcb65274024b9b.tar.bz2
scummvm-rg350-c285d3299c2c87f6d5c6279e7ebcb65274024b9b.zip
CGE2: Silence GCC warnings.
-rw-r--r--engines/cge2/cge2_main.cpp4
-rw-r--r--engines/cge2/spare.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index e0cd688988..938ad849be 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -310,9 +310,9 @@ Sprite *CGE2Engine::loadSprite(const char *fname, int ref, int scene, V3D &pos)
for (int i = 0; i < kActions; i++)
sprite->_actionCtrl[i]._cnt = cnt[i];
-
- return sprite;
}
+
+ return sprite;
}
void CGE2Engine::loadScript(const char *fname) {
diff --git a/engines/cge2/spare.cpp b/engines/cge2/spare.cpp
index 756f937ab5..411327e40a 100644
--- a/engines/cge2/spare.cpp
+++ b/engines/cge2/spare.cpp
@@ -73,10 +73,11 @@ Sprite *Spare::take(int ref) {
for (uint i = 0; i < _container.size(); ++i) {
if (spr == _container[i]) {
_container.remove_at(i);
- return spr;
+ break;
}
}
}
+ return spr;
}
void Spare::takeScene(int cav) {