mirror/fallout1-ce
1
0
Fork 0
mirror of https://github.com/alexbatalov/fallout1-ce.git synced 2024-10-02 21:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix townmap entrance buttons

Browse Source 
Closes #82
This commit is contained in:
Alexander Batalov 2023-09-15 19:21:20 +03:00
parent 6be823cf7c
commit 64c182919a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game/worldmap.cc
View File

@ -3557,12 +3557,12 @@ static int RegTMAPsels(int win, int city)
} }
if (TwnSelKnwFlag[city][index]) { if (TwnSelKnwFlag[city][index]) {
memset(hvrbtn[index], 0, 164 * 25); memset(hvrbtn[count], 0, 164 * 25);
buf_to_buf(tmapbmp[TOWNMAP_FRM_HOTSPOT_NORMAL], buf_to_buf(tmapbmp[TOWNMAP_FRM_HOTSPOT_NORMAL],
HOTSPOT_WIDTH, HOTSPOT_WIDTH,
HOTSPOT_HEIGHT, HOTSPOT_HEIGHT,
HOTSPOT_WIDTH, HOTSPOT_WIDTH,
hvrbtn[index] + 164 * 12 + 69, hvrbtn[count] + 164 * 12 + 69,
164); 164);
switch (v4) { switch (v4) {
@ -3582,12 +3582,12 @@ static int RegTMAPsels(int win, int city)
name_x = 0; name_x = 0;
} }
text_to_buf(hvrbtn[index] + name_x, name, 164, 164, color); text_to_buf(hvrbtn[count] + name_x, name, 164, 164, color);
button_x = entry->x - 57; button_x = entry->x - 57;
button_y = entry->y - 6; button_y = entry->y - 6;
TMSelBttns[index] = win_register_button(win, TMSelBttns[count] = win_register_button(win,
entry->x - 57, entry->x - 57,
entry->y - 6, entry->y - 6,
164, 164,
@ -3598,18 +3598,18 @@ static int RegTMAPsels(int win, int city)
514 + count, 514 + count,
onbtn, onbtn,
offbtn, offbtn,
hvrbtn[index], hvrbtn[count],
BUTTON_FLAG_TRANSPARENT); BUTTON_FLAG_TRANSPARENT);
win_register_button_mask(TMSelBttns[index], btnmsk); win_register_button_mask(TMSelBttns[count], btnmsk);
win_register_button_func(TMSelBttns[index], NULL, HvrOffBtn, NULL, NULL); win_register_button_func(TMSelBttns[count], NULL, HvrOffBtn, NULL, NULL);
debug_printf("button found count=%d, bcount=%d, btnid=%d\n", index, count, TMSelBttns[index]); debug_printf("button found count=%d, bcount=%d, btnid=%d\n", index, count, TMSelBttns[count]);
win_register_button_sound_func(TMSelBttns[index], gsound_med_butt_press, NULL); win_register_button_sound_func(TMSelBttns[count], gsound_med_butt_press, NULL);
brnpos[index].x = button_x; brnpos[count].x = button_x;
brnpos[index].y = button_y; brnpos[count].y = button_y;
brnpos[index].bid = TMSelBttns[index]; brnpos[count].bid = TMSelBttns[count];
tcode_xref[count] = index; tcode_xref[count] = index;