Skip to content

Commit

Permalink
Merge pull request #19 from hirdrac/master
Browse files Browse the repository at this point in the history
compile fix for libstdc++14
  • Loading branch information
goblinhack authored May 19, 2024
2 parents 3360372 + bf1ae89 commit c241ea8
Show file tree
Hide file tree
Showing 27 changed files with 27 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/game_jump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "my_array_bounds_check.hpp"
#include "my_game.hpp"
#include <algorithm>

//
// This is used by the AI to work out if a monst can jump over an obstacle "*"
Expand Down
1 change: 1 addition & 0 deletions src/laser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "my_game.hpp"
#include "my_thing.hpp"
#include <algorithm>

Laser_::Laser_(Levelp level, ThingId thing_id, ThingId victim_id, LaserInfo info)
: id(thing_id), victim_id(victim_id), info(info)
Expand Down
1 change: 1 addition & 0 deletions src/laser_ascii.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "my_game.hpp"
#include "my_thing.hpp"
#include "my_wid.hpp"
#include <algorithm>

void Level::display_ascii_lasers(point tl, point br)
{
Expand Down
1 change: 1 addition & 0 deletions src/laser_pixelart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "my_math.hpp"
#include "my_thing.hpp"
#include "my_vector_bounds_check.hpp"
#include <algorithm>

void Level::display_pixelart_lasers(point tl, point br)
{
Expand Down
1 change: 1 addition & 0 deletions src/level_map_things.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "my_array_bounds_check.hpp"
#include "my_level.hpp"
#include "my_thing.hpp"
#include <algorithm>

void Level::put_thing(int x, int y, ThingId id)
{
Expand Down
1 change: 1 addition & 0 deletions src/particle_external.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "my_game.hpp"
#include "my_thing.hpp"
#include <algorithm>

void Level::new_external_particle(ThingId id, point start, point stop, isize sz, uint32_t dur, const Tilep tile,
bool hflip, MyCallback callback)
Expand Down
1 change: 1 addition & 0 deletions src/particle_internal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "my_color_defs.hpp"
#include "my_game.hpp"
#include "my_thing.hpp"
#include <algorithm>

void Level::new_internal_particle(ThingId id, point start, point stop, isize sz, uint32_t dur, const Tilep tile,
bool hflip, MyCallback callback)
Expand Down
1 change: 1 addition & 0 deletions src/projectile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "my_game.hpp"
#include "my_thing.hpp"
#include <algorithm>

Projectile_::Projectile_(Levelp level, ThingId thing_id, ThingId victim_id, ProjectileInfo info)
: id(thing_id), victim_id(victim_id), info(info)
Expand Down
1 change: 1 addition & 0 deletions src/projectile_ascii.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "my_thing.hpp"
#include "my_vector_bounds_check.hpp"
#include "my_wid.hpp"
#include <algorithm>

void Level::display_ascii_projectiles(point tl, point br)
{
Expand Down
1 change: 1 addition & 0 deletions src/projectile_pixelart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "my_math.hpp"
#include "my_thing.hpp"
#include "my_vector_bounds_check.hpp"
#include <algorithm>

void Level::display_pixelart_projectiles(point tl, point br)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_ai.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "my_sprintf.hpp"
#include "my_thing.hpp"
#include "my_thing_attack_options.hpp"
#include <algorithm>

#define GOAL_PRIO_VERY_HIGH 0
#define GOAL_PRIO_HIGHER 1
Expand Down
1 change: 1 addition & 0 deletions src/thing_buff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "my_monst.hpp"
#include "my_thing.hpp"
#include "my_wid_buffbox.hpp"
#include <algorithm>

bool Thing::buff_add(Thingp buff)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_carry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "my_game.hpp"
#include "my_monst.hpp"
#include "my_thing.hpp"
#include <algorithm>

std::vector< ThingId > Thing::copy_of_carrying(void)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_debuff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "my_monst.hpp"
#include "my_thing.hpp"
#include "my_wid_debuffbox.hpp"
#include <algorithm>

bool Thing::debuff_add(Thingp debuff)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_drop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "my_thing.hpp"
#include "my_wid_inventory.hpp"
#include "my_wid_thing_info.hpp"
#include <algorithm>

void Thing::on_dropped(void)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_equip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "my_string.hpp"
#include "my_thing.hpp"
#include "my_thing_attack_options.hpp"
#include <algorithm>

void Thing::auto_equip(void)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_fini.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "my_wid_bag.hpp"
#include "my_wid_inventory.hpp"
#include "my_wid_thing_info.hpp"
#include <algorithm>

Thing::~Thing_(void)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_nearby.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "my_level.hpp"
#include "my_monst.hpp"
#include "my_thing.hpp"
#include <algorithm>

Thingp Thing::most_dangerous_adjacent_thing(void)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_skill.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "my_ui.hpp"
#include "my_vector_bounds_check.hpp"
#include "my_wid_skillbox.hpp"
#include <algorithm>

//
// Get the list of all other skills this skill replaces. This is done
Expand Down
1 change: 1 addition & 0 deletions src/thing_spell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "my_ui.hpp"
#include "my_vector_bounds_check.hpp"
#include "my_wid_spellbox.hpp"
#include <algorithm>

//
// Get the list of all other spells this spell replaces. This is done
Expand Down
1 change: 1 addition & 0 deletions src/thing_template.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "my_ptrcheck.hpp"
#include "my_string.hpp"
#include "my_vector_bounds_check.hpp"
#include <algorithm>

Tpnamemap tp_name_map;
Tpidmap tp_id_map;
Expand Down
1 change: 1 addition & 0 deletions src/thing_use.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "my_python.hpp"
#include "my_string.hpp"
#include "my_thing.hpp"
#include <algorithm>

void Thing::on_use(Thingp what)
{
Expand Down
1 change: 1 addition & 0 deletions src/thing_wander.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "my_vector_bounds_check.hpp"

#include <limits> // do not remove
#include <algorithm>

bool Thing::ai_blocked(void)
{
Expand Down
1 change: 1 addition & 0 deletions src/wid_bag.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "my_wid_rightbar.hpp"
#include "my_wid_thing_info.hpp"
#include "my_wid_topcon.hpp"
#include <algorithm>

static void wid_bag_tick(Widp w);

Expand Down
1 change: 1 addition & 0 deletions src/wid_console.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "my_ui.hpp"
#include "my_unicode.hpp"
#include "my_wid_console.hpp"
#include <algorithm>

static int wid_console_inited;
static int wid_console_commands_inited;
Expand Down
1 change: 1 addition & 0 deletions src/wid_leftbar_display.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "my_ui.hpp"
#include "my_wid_leftbar.hpp"
#include "my_wid_thing_info.hpp"
#include <algorithm>

static point wid_leftbar_last_thing_position;

Expand Down
1 change: 1 addition & 0 deletions src/wid_topcon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "my_wid_thing_info.hpp"
#include "my_wid_topcon.hpp"
#include "my_wid_tp_info.hpp"
#include <algorithm>

static void wid_topcon_wid_create(void);

Expand Down

0 comments on commit c241ea8

Please sign in to comment.