aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2004-07-27 07:21:28 +0000
committerTravis Howell2004-07-27 07:21:28 +0000
commitc8cbe16c7a4758d161abd31a311c6540b6355543 (patch)
tree32ab80ccfe385902ac460078cc5061b8d53e08e6 /simon
parentf734014fd2ce201f1fbec340d09d5695305a649e (diff)
downloadscummvm-rg350-c8cbe16c7a4758d161abd31a311c6540b6355543.tar.gz
scummvm-rg350-c8cbe16c7a4758d161abd31a311c6540b6355543.tar.bz2
scummvm-rg350-c8cbe16c7a4758d161abd31a311c6540b6355543.zip
No need to calculate values
svn-id: r14351
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp20
-rw-r--r--simon/vga.cpp2
2 files changed, 11 insertions, 11 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index e1e61a4542..4169e38d2d 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2057,18 +2057,18 @@ void SimonEngine::hitarea_stuff_helper() {
time_t cur_time;
if (!(_game & GF_SIMON2)) {
- uint subr_id = _variableArray[0x1FC / 2];
+ uint subr_id = _variableArray[254];
if (subr_id != 0) {
Subroutine *sub = getSubroutineByID(subr_id);
if (sub != NULL) {
startSubroutineEx(sub);
startUp_helper_2();
}
- _variableArray[0x1FC / 2] = 0;
+ _variableArray[254] = 0;
_run_script_return_1 = false;
}
} else {
- if (_variableArray[0x1FC / 2] || _variableArray[0x1F2 / 2]) {
+ if (_variableArray[254] || _variableArray[249]) {
hitarea_stuff_helper_2();
}
}
@@ -2086,26 +2086,26 @@ void SimonEngine::hitarea_stuff_helper_2() {
uint subr_id;
Subroutine *sub;
- subr_id = _variableArray[0x1F2 / 2];
+ subr_id = _variableArray[249];
if (subr_id != 0) {
sub = getSubroutineByID(subr_id);
if (sub != NULL) {
- _variableArray[0x1F2 / 2] = 0;
+ _variableArray[249] = 0;
startSubroutineEx(sub);
startUp_helper_2();
}
- _variableArray[0x1F2 / 2] = 0;
+ _variableArray[249] = 0;
}
- subr_id = _variableArray[0x1FC / 2];
+ subr_id = _variableArray[254];
if (subr_id != 0) {
sub = getSubroutineByID(subr_id);
if (sub != NULL) {
- _variableArray[0x1FC / 2] = 0;
+ _variableArray[254] = 0;
startSubroutineEx(sub);
startUp_helper_2();
}
- _variableArray[0x1FC / 2] = 0;
+ _variableArray[254] = 0;
}
_run_script_return_1 = false;
@@ -2427,7 +2427,7 @@ void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
_vga_var3 = 0;
_vga_var5 = 134;
if (_variableArray[34] != -1)
- _variableArray[502 / 2] = 0;
+ _variableArray[251] = 0;
}
vc_ptr_org = _vc_ptr;
diff --git a/simon/vga.cpp b/simon/vga.cpp
index eedc2cc341..168e65489b 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -649,7 +649,7 @@ void SimonEngine::vc_10_draw() {
_vga_var7 = state.depack_src;
_vga_var5 = height;
if (_variableArray[34] == -1)
- state.x = _variableArray[502 / 2];
+ state.x = _variableArray[251];
_x_scroll = state.x;