aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMatthew Hoops2010-01-04 23:37:29 +0000
committerMatthew Hoops2010-01-04 23:37:29 +0000
commit3c0805550eec0405c2812ac9aeb3c82e25168fa4 (patch)
tree6742e939a45b762558d3e5ce42e6006bc1437204 /engines/sci
parentc26ac879c6ae1c41f8be48fea0337448f1bf4e46 (diff)
downloadscummvm-rg350-3c0805550eec0405c2812ac9aeb3c82e25168fa4.tar.gz
scummvm-rg350-3c0805550eec0405c2812ac9aeb3c82e25168fa4.tar.bz2
scummvm-rg350-3c0805550eec0405c2812ac9aeb3c82e25168fa4.zip
Remove the planes/screenItems count and use the arrays' size() function instead.
svn-id: r47000
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/gui/gui.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index d522538da9..32ab95f052 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -65,11 +65,6 @@ SciGui::SciGui(EngineState *state, SciGuiScreen *screen, SciGuiPalette *palette,
_controls = new SciGuiControls(_s->_segMan, _gfx, _text);
_menu = new SciGuiMenu(_s->_event, _s->_segMan, _gfx, _text, _screen, _cursor);
// _gui32 = new SciGui32(_s, _screen, _palette, _cursor); // for debug purposes
-
-#ifdef ENABLE_SCI32
- _screenItemCount = 0;
- _planeCount = 0;
-#endif
}
SciGui::SciGui() {
@@ -845,14 +840,12 @@ uint16 SciGui::getScreenHeight() {
#ifdef ENABLE_SCI32
void SciGui::addScreenItem(reg_t object) {
_screenItems.push_back(object);
- _screenItemCount++;
}
void SciGui::deleteScreenItem(reg_t object) {
- for (int itemNr = 0; itemNr < _screenItemCount; itemNr++) {
+ for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
if (_screenItems[itemNr] == object) {
_screenItems.remove_at(itemNr);
- _screenItemCount--;
return;
}
}
@@ -860,7 +853,6 @@ void SciGui::deleteScreenItem(reg_t object) {
void SciGui::addPlane(reg_t object) {
_planes.push_back(object);
- _planeCount++;
}
void SciGui::updatePlane(reg_t object) {
@@ -872,24 +864,23 @@ void SciGui::updatePlane(reg_t object) {
}
void SciGui::deletePlane(reg_t object) {
- for (int planeNr = 0; planeNr < _planeCount; planeNr++) {
+ for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) {
if (_planes[planeNr] == object) {
_planes.remove_at(planeNr);
- _planeCount--;
return;
}
}
}
void SciGui::frameOut() {
- for (int planeNr = 0; planeNr < _planeCount; planeNr++) {
+ for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) {
reg_t planeObj = _planes[planeNr];
int16 priority = GET_SEL32V(_s->_segMan, planeObj, priority);
if (priority == -1)
continue;
- for (int itemNr = 0; itemNr < _screenItemCount; itemNr++) {
+ for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
reg_t viewObj = _screenItems[itemNr];
reg_t planeOfItem = GET_SEL32(_s->_segMan, viewObj, plane);
if (planeOfItem == _planes[planeNr]) {