Skip to content

Commit 0f03908

Browse files
authored
Spy window shows objects again (#3833)
Fixes #3832
1 parent f4d59fe commit 0f03908

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/config_objects.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,8 @@ TbBool parse_objects_object_blocks(char *buf, long len, const char *config_textn
460460
case 18: // MAPICON
461461
if (get_conf_parameter_single(buf, &pos, len, word_buf, sizeof(word_buf)) > 0)
462462
{
463-
k = get_icon_id(word_buf);
464-
if (k != bad_icon_id)
463+
objst->map_icon = get_icon_id(word_buf);
464+
if (objst->map_icon != bad_icon_id)
465465
{
466466
n++;
467467
}

src/front_input.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -719,12 +719,12 @@ TbBool get_level_lost_inputs(void)
719719
if (is_game_key_pressed(Gkey_SwitchToMap, &keycode, false))
720720
{
721721
lbKeyOn[keycode] = 0;
722-
zoom_from_patchment_map();
722+
zoom_from_parchment_map();
723723
} else
724724
if ( right_button_released )
725725
{
726726
right_button_released = 0;
727-
zoom_from_patchment_map();
727+
zoom_from_parchment_map();
728728
} else
729729
if ( left_button_released )
730730
{
@@ -1927,7 +1927,7 @@ short get_map_action_inputs(void)
19271927
}
19281928
if (right_button_released) {
19291929
right_button_released = 0;
1930-
zoom_from_patchment_map();
1930+
zoom_from_parchment_map();
19311931
return true;
19321932
}
19331933
if (get_players_packet_action(player) != PckA_None)
@@ -1954,7 +1954,7 @@ short get_map_action_inputs(void)
19541954
{
19551955
clear_key_pressed(keycode);
19561956
turn_off_all_window_menus();
1957-
zoom_from_patchment_map();
1957+
zoom_from_parchment_map();
19581958
return true;
19591959
}
19601960
return false;

src/gui_parchment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ void zoom_to_parchment_map(void)
936936
}
937937
}
938938

939-
void zoom_from_patchment_map(void)
939+
void zoom_from_parchment_map(void)
940940
{
941941
struct PlayerInfo* player = get_my_player();
942942
if (((game.system_flags & GSF_NetworkActive) != 0)

src/gui_parchment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void redraw_minimal_overhead_view(void);
5050
long get_parchment_map_area_rect(struct TbRect *map_area);
5151
TbBool point_to_overhead_map(const struct Camera *camera, const long screen_x, const long screen_y, long *map_x, long *map_y);
5252

53-
void zoom_from_patchment_map(void);
53+
void zoom_from_parchment_map(void);
5454
void zoom_to_parchment_map(void);
5555
/******************************************************************************/
5656
#ifdef __cplusplus

0 commit comments

Comments
 (0)