aboutsummaryrefslogtreecommitdiff
path: root/engines/drascula/drascula.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/drascula/drascula.cpp')
-rw-r--r--engines/drascula/drascula.cpp47
1 files changed, 1 insertions, 46 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 1b381fc923..41d3af28e5 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -79,48 +79,6 @@ DrasculaEngine::~DrasculaEngine() {
delete _rnd;
}
-struct ItemLocation {
- int x;
- int y;
-};
-
-ItemLocation itemLocations[] = {
- { 0, 0 }, // empty
- { 5, 10 }, { 50, 10 }, { 95, 10 }, // 1-3
- { 140, 10 }, { 185, 10 }, { 230, 10 }, // 4-6
- { 275, 10 }, { 5, 40 }, { 50, 40 }, // 7-9
- { 95, 40 }, { 140, 40 }, { 185, 40 }, // 10-12
- { 230, 40 }, { 275, 40 }, { 5, 70 }, // 13-15
- { 50, 70 }, { 95, 70 }, { 140, 70 }, // 16-18
- { 185, 70 }, { 230, 70 }, { 275, 70 }, // 19-21
- { 5, 100 }, { 50, 100 }, { 95, 100 }, // 22-24
- { 140, 100 }, { 185, 100 }, { 230, 100 }, // 25-27
- { 275, 100 }, { 5, 130 }, { 50, 130 }, // 28-30
- { 95, 130 }, { 140, 130 }, { 185, 130 }, // 31-33
- { 230, 130 }, { 275, 130 }, { 5, 160 }, // 34-36
- { 50, 160 }, { 95, 160 }, { 140, 160 }, // 37-39
- { 185, 160 }, { 230, 160 }, { 275, 160 }, // 40-42
- { 275, 160 } // 43
-};
-
-static const int x_pol[44] = {0, 1, 42, 83, 124, 165, 206, 247, 83, 1, 206,
- 1, 42, 83, 124, 165, 206, 247, 83, 1, 206,
- 247, 83, 165, 1, 206, 42, 124, 83, 1, 247,
- 83, 165, 1, 206, 42, 124, 83, 1, 247, 42,
- 1, 165, 206};
-static const int y_pol[44] = {0, 1, 1, 1, 1, 1, 1, 1, 27, 27, 1,
- 27, 27, 27, 27, 27, 27, 27, 1, 1, 27,
- 1, 1, 1, 1, 1, 27, 27, 27, 27, 27,
- 1, 1, 1, 1, 1, 27, 27, 27, 27, 27,
- 27, 1, 1};
-static const int x_barra[] = {6, 51, 96, 141, 186, 232, 276, 321};
-static const int x1d_menu[] = {280, 40, 80, 120, 160, 200, 240, 0, 40, 80, 120,
- 160, 200, 240, 0, 40, 80, 120, 160, 200, 240, 0,
- 40, 80, 120, 160, 200, 240, 0};
-static const int y1d_menu[] = {0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25,
- 50, 50, 50, 50, 50, 50, 50, 75, 75, 75, 75, 75, 75, 75, 100};
-static int frame_x[20] = {43, 87, 130, 173, 216, 259};
-
int DrasculaEngine::init() {
// Initialize backend
_system->beginGFXTransaction();
@@ -694,10 +652,7 @@ bucles:
cont_sv = 0;
}
- if (mouseY < 24 && menuScreen == 0)
- menuBar = 1;
- else
- menuBar = 0;
+ menuBar = (mouseY < 24 && menuScreen == 0) ? 1 : 0;
Common::KeyCode key = getScan();
if (key == Common::KEYCODE_F1 && menuScreen == 0) {