diff options
Diffstat (limited to 'simon')
-rw-r--r-- | simon/simon.cpp | 8 | ||||
-rw-r--r-- | simon/simon.h | 4 | ||||
-rw-r--r-- | simon/verb.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 573df4459d..42e80d3fcf 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -1126,9 +1126,9 @@ void SimonState::setup_cond_c_helper() { if (_last_hitarea == NULL) { } else if (_last_hitarea->id == 0x7FFB) { - handle_unk2_hitarea(_last_hitarea->fcs); + handle_uparrow_hitarea(_last_hitarea->fcs); } else if (_last_hitarea->id == 0x7FFC) { - handle_unk_hitarea(_last_hitarea->fcs); + handle_downarrow_hitarea(_last_hitarea->fcs); } else if (_last_hitarea->item_ptr != NULL) { _hitarea_object_item = _last_hitarea->item_ptr; _variableArray[60] = (_last_hitarea->flags & 1) ? (_last_hitarea->flags >> 8) : 0xFFFF; @@ -1590,9 +1590,9 @@ startOver: if (ha == NULL) { } else if (ha->id == 0x7FFB) { - handle_unk2_hitarea(ha->fcs); + handle_uparrow_hitarea(ha->fcs); } else if (ha->id == 0x7FFC) { - handle_unk_hitarea(ha->fcs); + handle_downarrow_hitarea(ha->fcs); } else if (ha->id >= 101 && ha->id < 113) { _verb_hitarea = ha->unk3; handle_verb_hitarea(ha); diff --git a/simon/simon.h b/simon/simon.h index e5c10c8d9e..fa69e67e00 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -519,8 +519,8 @@ public: void defocusHitarea(); void startSubroutine170(); void runSubroutine101(); - void handle_unk2_hitarea(FillOrCopyStruct *fcs); - void handle_unk_hitarea(FillOrCopyStruct *fcs); + void handle_uparrow_hitarea(FillOrCopyStruct *fcs); + void handle_downarrow_hitarea(FillOrCopyStruct *fcs); void hitareaChangedHelper(); void focusVerb(uint hitarea_id); HitArea *findHitAreaByID(uint hitarea_id); diff --git a/simon/verb.cpp b/simon/verb.cpp index 8b4b882d11..3413f4d99b 100644 --- a/simon/verb.cpp +++ b/simon/verb.cpp @@ -307,7 +307,7 @@ void SimonState::leaveHitAreaById(uint hitarea_id) { hitarea_leave(ha); } -void SimonState::handle_unk2_hitarea(FillOrCopyStruct *fcs) { +void SimonState::handle_uparrow_hitarea(FillOrCopyStruct *fcs) { uint index; index = get_fcs_ptr_3_index(fcs); @@ -320,7 +320,7 @@ void SimonState::handle_unk2_hitarea(FillOrCopyStruct *fcs) { unlock(); } -void SimonState::handle_unk_hitarea(FillOrCopyStruct *fcs) { +void SimonState::handle_downarrow_hitarea(FillOrCopyStruct *fcs) { uint index; index = get_fcs_ptr_3_index(fcs); |