Skip to content

Commit e2e8af4

Browse files
committed
Addressed IWYU complaints
1 parent db3e033 commit e2e8af4

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/avatar.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,15 @@ void avatar::set_active_mission( mission &cur_mission )
347347

348348
void avatar::set_active_point_of_interest( point_of_interest active_point_of_interest )
349349
{
350-
for( auto iter = points_of_interest.begin(); iter < points_of_interest.end(); iter++ ) {
350+
for( auto iter : points_of_interest ) {
351351
// It's really sufficient to only check the position as used...
352-
if( iter._Ptr->pos == active_point_of_interest.pos &&
353-
iter._Ptr->text == active_point_of_interest.text ) {
352+
if( iter.pos == active_point_of_interest.pos &&
353+
iter.text == active_point_of_interest.text ) {
354354
this->active_point_of_interest = active_point_of_interest;
355355
active_mission = nullptr;
356356
return;
357357
}
358+
358359
}
359360

360361
debugmsg( "active point of interest %s is not in the points_of_interest list",
@@ -446,7 +447,7 @@ void avatar::add_point_of_interest( point_of_interest new_point_of_interest )
446447
void avatar::delete_point_of_interest( tripoint_abs_omt pos )
447448
{
448449
for( auto iter = points_of_interest.begin(); iter != points_of_interest.end(); iter++ ) {
449-
if( iter._Ptr->pos == pos ) {
450+
if( iter->pos == pos ) {
450451
points_of_interest.erase( iter );
451452

452453
if( active_point_of_interest.pos == pos ) {

src/avatar.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "magic_teleporter_list.h"
2626
#include "mdarray.h"
2727
#include "memory_fast.h"
28+
#include "point.h"
2829
#include "type_id.h"
2930
#include "units.h"
3031

src/mission_ui.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "npc.h"
1919
#include "faction.h"
2020
#include "output.h"
21+
#include "point.h"
2122
#include "string_formatter.h"
2223
#include "talker.h"
2324
#include "translation.h"
@@ -239,8 +240,8 @@ void mission_ui_impl::draw_controls()
239240
get_avatar().delete_point_of_interest( upoints_of_interest[selected_mission].pos );
240241
}
241242

242-
if( selected_tab != mission_ui_tab_enum::POINTS_OF_INTEREST && umissions.empty() ||
243-
selected_tab == mission_ui_tab_enum::POINTS_OF_INTEREST && upoints_of_interest.empty() ) {
243+
if( ( selected_tab != mission_ui_tab_enum::POINTS_OF_INTEREST && umissions.empty() ) ||
244+
( selected_tab == mission_ui_tab_enum::POINTS_OF_INTEREST && upoints_of_interest.empty() ) ) {
244245
static const std::map< mission_ui_tab_enum, std::string > nope = {
245246
{ mission_ui_tab_enum::ACTIVE, translate_marker( "You have no active missions!" ) },
246247
{ mission_ui_tab_enum::COMPLETED, translate_marker( "You haven't completed any missions!" ) },

0 commit comments

Comments
 (0)