Overload map::make_rubble to avoid having referenced to t_* and f_* i…

…n the header.
LordTy · Jun 20, 2015 · 6c7eb4a · 6c7eb4a
1 parent 5f9961e
commit 6c7eb4a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/lua/class_definitions.lua b/lua/class_definitions.lua
@@ -1043,7 +1043,6 @@ classes = {
             { name = "light_transparency", rval = "float", args = { "tripoint" } },
             { name = "load", rval = nil, args = { "int", "int", "int", "bool" } },
             { name = "make_rubble", rval = nil, args = { "tripoint" } },
-            { name = "make_rubble", rval = nil, args = { "tripoint", "furn_id" } },
             { name = "make_rubble", rval = nil, args = { "tripoint", "furn_id", "bool" } },
             { name = "make_rubble", rval = nil, args = { "tripoint", "furn_id", "bool", "ter_id" } },
             { name = "make_rubble", rval = nil, args = { "tripoint", "furn_id", "bool", "ter_id", "bool" } },

diff --git a/src/map.cpp b/src/map.cpp
@@ -2110,6 +2110,16 @@ int map::bash_rating( const int str, const tripoint &p, const bool allow_floor )
 
 // End of 3D bashable
 
+void map::make_rubble( const tripoint &p )
+{
+    make_rubble( p, f_rubble, false, t_dirt, false );
+}
+
+void map::make_rubble( const tripoint &p, const furn_id rubble_type, const bool items )
+{
+    make_rubble( p, rubble_type, items, t_dirt, false );
+}
+
 void map::make_rubble( const tripoint &p, furn_id rubble_type, bool items, ter_id floor_type, bool overwrite)
 {
     if (overwrite) {

diff --git a/src/map.h b/src/map.h
@@ -596,10 +596,12 @@ class map
 
     /** Generates rubble at the given location, if overwrite is true it just writes on top of what currently exists
      *  floor_type is only used if there is a non-bashable wall at the location or with overwrite = true */
-    void make_rubble( const tripoint &p, furn_id rubble_type = f_rubble, bool items = false,
-                      ter_id floor_type = t_dirt, bool overwrite = false);
-    void make_rubble( int, int, furn_id rubble_type = f_rubble, bool items = false,
-                      ter_id floor_type = t_dirt, bool overwrite = false) = delete;
+    void make_rubble( const tripoint &p, furn_id rubble_type, bool items,
+                      ter_id floor_type, bool overwrite = false );
+    void make_rubble( const tripoint &p );
+    void make_rubble( const tripoint &p, furn_id rubble_type, bool items );
+    void make_rubble( int, int, furn_id rubble_type, bool items,
+                      ter_id floor_type, bool overwrite = false) = delete;
 
  bool is_divable(const int x, const int y) const;
  bool is_outside(const int x, const int y) const;