aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2005-11-12 08:20:47 +0000
committerTravis Howell2005-11-12 08:20:47 +0000
commit5d4d7918485e9096566a1c576ac73c35d1742202 (patch)
tree1f680614b489d7142efd8091155fde9832224252 /simon
parentbb1baa3a1582820e0cbad2213f435853ab5ccd91 (diff)
downloadscummvm-rg350-5d4d7918485e9096566a1c576ac73c35d1742202.tar.gz
scummvm-rg350-5d4d7918485e9096566a1c576ac73c35d1742202.tar.bz2
scummvm-rg350-5d4d7918485e9096566a1c576ac73c35d1742202.zip
Cleanup.
svn-id: r19569
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp12
-rw-r--r--simon/simon.h6
2 files changed, 9 insertions, 9 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index bcd9f85faf..eda0a6720c 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1830,18 +1830,18 @@ void SimonEngine::drawIconArray(uint fcs_index, Item *item_ptr, int unk1, int un
fcs_ptr->fcs_data->e[k].item = NULL;
if (j != 0 || fcs_ptr->fcs_data->unk1 != 0) {
- fcs_unk_proc_2(fcs_ptr, fcs_index);
+ addArrows(fcs_ptr, fcs_index);
}
}
-void SimonEngine::fcs_unk_proc_2(FillOrCopyStruct *fcs, uint fcs_index) {
- setup_hit_areas(fcs, fcs_index);
+void SimonEngine::addArrows(FillOrCopyStruct *fcs, uint fcs_index) {
+ setArrowHitAreas(fcs, fcs_index);
fcs->fcs_data->upArrow = _scrollUpHitArea;
fcs->fcs_data->downArrow = _scrollDownHitArea;
}
-void SimonEngine::setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index) {
+void SimonEngine::setArrowHitAreas(FillOrCopyStruct *fcs, uint fcs_index) {
HitArea *ha;
ha = findEmptyHitArea();
@@ -3058,7 +3058,7 @@ void SimonEngine::removeIconArray(uint fcs_index) {
if (fcs->fcs_data->downArrow != -1) {
delete_hitarea_by_index(fcs->fcs_data->downArrow);
if (getGameType() == GType_SIMON1)
- fcs_unk_5(fcs, fcs_index);
+ removeArrows(fcs, fcs_index);
}
free(fcs->fcs_data);
@@ -3069,7 +3069,7 @@ void SimonEngine::removeIconArray(uint fcs_index) {
}
// ok
-void SimonEngine::fcs_unk_5(FillOrCopyStruct *fcs, uint fcs_index) {
+void SimonEngine::removeArrows(FillOrCopyStruct *fcs, uint fcs_index) {
o_kill_sprite_simon1(128);
}
diff --git a/simon/simon.h b/simon/simon.h
index 3f36ca5fba..b37a94c8b7 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -626,7 +626,7 @@ protected:
bool has_item_childflag_0x10(Item *item);
uint item_get_icon_number(Item *item);
uint setup_icon_hit_area(FillOrCopyStruct *fcs, uint x, uint y, uint icon_number, Item *item_ptr);
- void fcs_unk_proc_2(FillOrCopyStruct *fcs, uint fcs_index);
+ void addArrows(FillOrCopyStruct *fcs, uint fcs_index);
void loadIconFile();
void processSpecialKeys();
@@ -653,7 +653,7 @@ protected:
void render_string_amiga(uint vga_sprite_id, uint color, uint width, uint height, const char *txt);
void render_string(uint vga_sprite_id, uint color, uint width, uint height, const char *txt);
- void setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index);
+ void setArrowHitAreas(FillOrCopyStruct *fcs, uint fcs_index);
byte *setup_vga_destination(uint32 size);
void vga_buf_unk_proc3(byte *end);
@@ -783,7 +783,7 @@ protected:
void video_copy_if_flag_0x8_c(FillOrCopyStruct *fcs);
void delete_hitarea_by_index(uint index);
- void fcs_unk_5(FillOrCopyStruct *fcs, uint fcs_index);
+ void removeArrows(FillOrCopyStruct *fcs, uint fcs_index);
void fcs_putchar(uint a);
void copy_img_from_3_to_2(FillOrCopyStruct *fcs);