Skip to content

Commit a7a2b9c

Browse files
authored
Merge pull request scp-fs2open#7518 from Goober5000/cleanpup/waypoint_move
remove empty destructors so waypoints can be moved
2 parents 1c079a7 + 9f27adc commit a7a2b9c

2 files changed

Lines changed: 0 additions & 12 deletions

File tree

code/object/waypoint.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ waypoint::waypoint(const vec3d *position)
3838
this->m_objnum = -1;
3939
}
4040

41-
waypoint::~waypoint()
42-
{
43-
// nothing to do
44-
}
45-
4641
const vec3d *waypoint::get_pos() const
4742
{
4843
if (m_objnum >= 0)
@@ -118,11 +113,6 @@ waypoint_list::waypoint_list(const char *name)
118113
this->m_color_r = this->m_color_g = this->m_color_b = 255;
119114
}
120115

121-
waypoint_list::~waypoint_list()
122-
{
123-
// nothing to do
124-
}
125-
126116
const char *waypoint_list::get_name() const
127117
{
128118
return m_name;

code/object/waypoint.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class waypoint
1212
public:
1313
waypoint();
1414
waypoint(const vec3d *pos);
15-
~waypoint();
1615

1716
// accessors
1817
const vec3d *get_pos() const;
@@ -37,7 +36,6 @@ class waypoint_list
3736
public:
3837
waypoint_list();
3938
waypoint_list(const char *name);
40-
~waypoint_list();
4139

4240
// accessors
4341
const char *get_name() const;

0 commit comments

Comments
 (0)