aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/ui
diff options
context:
space:
mode:
authorPeter Kohaut2019-03-04 18:57:25 +0100
committerPeter Kohaut2019-03-04 19:43:36 +0100
commit9c25be9121bbd159163c458ce500379774a2ef3e (patch)
tree336f65671525bd2774427e8b56f37c56e7e6da33 /engines/bladerunner/ui
parent9c562da4ede87ba5b4ad174fb804bd2529cf38e7 (diff)
downloadscummvm-rg350-9c25be9121bbd159163c458ce500379774a2ef3e.tar.gz
scummvm-rg350-9c25be9121bbd159163c458ce500379774a2ef3e.tar.bz2
scummvm-rg350-9c25be9121bbd159163c458ce500379774a2ef3e.zip
BLADERUNNER: Cleanup of TODO notes
Diffstat (limited to 'engines/bladerunner/ui')
-rw-r--r--engines/bladerunner/ui/elevator.cpp4
-rw-r--r--engines/bladerunner/ui/elevator.h1
-rw-r--r--engines/bladerunner/ui/esper.cpp9
-rw-r--r--engines/bladerunner/ui/esper.h2
-rw-r--r--engines/bladerunner/ui/kia.cpp4
-rw-r--r--engines/bladerunner/ui/kia_section_clues.h1
6 files changed, 3 insertions, 18 deletions
diff --git a/engines/bladerunner/ui/elevator.cpp b/engines/bladerunner/ui/elevator.cpp
index a5e0c65fdd..9baca0f3f4 100644
--- a/engines/bladerunner/ui/elevator.cpp
+++ b/engines/bladerunner/ui/elevator.cpp
@@ -303,10 +303,6 @@ void Elevator::tickDescription() {
_sentenceId = -1;
}
-void Elevator::resume() {
- // TODO
-}
-
void Elevator::mouseInCallback(int buttonId, void *self) {
((Elevator *)self)->buttonFocus(buttonId);
}
diff --git a/engines/bladerunner/ui/elevator.h b/engines/bladerunner/ui/elevator.h
index f2e1443929..96724430b0 100644
--- a/engines/bladerunner/ui/elevator.h
+++ b/engines/bladerunner/ui/elevator.h
@@ -59,7 +59,6 @@ public:
void setupDescription(int actorId, int sentenceId);
void resetDescription();
void tickDescription();
- void resume();
private:
static void mouseInCallback(int, void *);
diff --git a/engines/bladerunner/ui/esper.cpp b/engines/bladerunner/ui/esper.cpp
index 4b6b7f04c0..a5d858e3a3 100644
--- a/engines/bladerunner/ui/esper.cpp
+++ b/engines/bladerunner/ui/esper.cpp
@@ -245,10 +245,6 @@ void ESPER::tick() {
}
}
-void ESPER::resume() {
- // TODO
-}
-
void ESPER::addPhoto(const char *name, int photoId, int shapeId) {
int i = findEmptyPhoto();
if (i >= 0) {
@@ -303,9 +299,7 @@ void ESPER::mouseUpCallback(int buttonId, void *callbackData) {
if (buttonId < kPhotoCount) {
self->selectPhoto(buttonId);
} else if (self->_statePhoto != kEsperPhotoStateVideoZoomOut) {
- if (buttonId == kPhotoCount + 1) {
- // TODO: is it even used?
- } else if (buttonId == kPhotoCount + 2) {
+ if (buttonId == kPhotoCount + 2) {
self->zoomOutStop();
} else if (buttonId == kPhotoCount + 3) {
self->goBack();
@@ -912,7 +906,6 @@ void ESPER::drawVideoZoomOut(Graphics::Surface &surface) {
if (timeNow > _timeZoomNext && _vqaLastFrame > 0) {
_timeZoomNext = timeNow + 300;
playSound(419, 25);
- //TODO: implement frame loading after seek, then advanceFrame can be removed
_vqaPlayerPhoto->seekToFrame(_vqaLastFrame);
int nextFrame = _vqaPlayerPhoto->getFrameCount() / 4;
if (nextFrame <= 0) {
diff --git a/engines/bladerunner/ui/esper.h b/engines/bladerunner/ui/esper.h
index 4a1c606498..34648a38f4 100644
--- a/engines/bladerunner/ui/esper.h
+++ b/engines/bladerunner/ui/esper.h
@@ -195,8 +195,6 @@ public:
void tick();
- void resume();
-
void addPhoto(const char *name, int photoId, int shapeId);
void defineRegion(int regionId, Common::Rect inner, Common::Rect outer, Common::Rect selection, const char *name);
diff --git a/engines/bladerunner/ui/kia.cpp b/engines/bladerunner/ui/kia.cpp
index 2cc978f0cc..be64131d34 100644
--- a/engines/bladerunner/ui/kia.cpp
+++ b/engines/bladerunner/ui/kia.cpp
@@ -315,7 +315,7 @@ void KIA::tick() {
_shapes->get(39)->draw(_vm->_surfaceFront, 583, 342);
}
}
- //TODO: implement frame loading after seek, then advanceFrame can be removed
+
_playerVqaPlayer->seekToFrame(_playerVqaFrame);
_playerVqaPlayer->update(true, true);
@@ -370,7 +370,7 @@ void KIA::tick() {
_shapes->get(47)->draw(_vm->_surfaceFront, 182, 446);
}
}
- _vm->_mainFont->drawColor("1.00", _vm->_surfaceFront, 438, 471, 0x1CE7); // TODO: 1.01 for DVD version
+ _vm->_mainFont->drawColor("1.00", _vm->_surfaceFront, 438, 471, 0x1CE7); // 1.01 is DVD version, but only cd handling routines were changed, no game logic
if (!_transitionId) {
_buttons->drawTooltip(_vm->_surfaceFront, mouse.x, mouse.y);
}
diff --git a/engines/bladerunner/ui/kia_section_clues.h b/engines/bladerunner/ui/kia_section_clues.h
index 1061e637df..eb43f60102 100644
--- a/engines/bladerunner/ui/kia_section_clues.h
+++ b/engines/bladerunner/ui/kia_section_clues.h
@@ -36,7 +36,6 @@ class UIImagePicker;
class UIScrollBox;
class KIASectionClues : public KIASectionBase {
- //TODO: use gameInfo->getClueCount(), not in original game
static const int kClueCount = 288;
struct Line {