Skip to content

Commit

Permalink
Update overmap_ui.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
WhiteCloud0123 committed Apr 7, 2024
1 parent 0e4b7f7 commit 0bb19aa
Showing 1 changed file with 1 addition and 43 deletions.
44 changes: 1 addition & 43 deletions src/overmap_ui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -647,29 +647,7 @@ static void draw_ascii(
std::unordered_map<point_abs_omt, int> player_path_route;
std::unordered_map<tripoint_abs_omt, npc_coloring> npc_color;
auto npcs_near_player = overmap_buffer.get_npcs_near_player( sight_points );


std::vector<tripoint_abs_omt> pet_loc_vec;
std::vector<std::string> pet_sym_vec;
std::vector<nc_color> pet_basic_symbol_color_vec;
int draw_pet_count = 0;
for (Creature* c : get_player_character().get_visible_creatures(MAPSIZE_X)) {
monster* m = dynamic_cast<monster*>(c);
if (m != nullptr) {

if (m->has_effect(effect_pet)) {

pet_loc_vec.push_back(m->global_omt_location());
pet_sym_vec.push_back(m->symbol());
pet_basic_symbol_color_vec.push_back(m->basic_symbol_color());

}

}
}




if( blink ) {
// get seen NPCs
for( const auto &np : npcs_near_player ) {
Expand Down Expand Up @@ -892,26 +870,6 @@ static void draw_ascii(
}
}

// 如果已经绘制完了宠物,就不用再继续绘制了。同时,如果同一地图格有玩家,那么也不要绘制
if ( blink && draw_pet_count != pet_loc_vec.size() && omp!=orig) {
int i = 0;
for (const auto &iter : pet_loc_vec) {

if (omp.xy() == iter.xy()) {

ter_sym = pet_sym_vec[i];
ter_color = pet_basic_symbol_color_vec[i];
draw_pet_count = draw_pet_count + 1;

}
i++;
}

}




if( omp.xy() == center.xy() && !uistate.place_special ) {
ccur_ter = cur_ter;
mvwputch_hi( w, point( i, j ), ter_color, ter_sym );
Expand Down

0 comments on commit 0bb19aa

Please sign in to comment.