summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-22 01:28:56 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-22 01:28:56 +0300
commitcc7a39f467a49b2e91717739cb6e7c3c4b34a245 (patch)
treeb930d808b5782b77dfa7cd52bbaa902101b8ba06 /src/resources
parent2e07d1c5eb79eb291c20da511d0a313f56690756 (diff)
downloadplus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.tar.gz
plus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.tar.bz2
plus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.tar.xz
plus-cc7a39f467a49b2e91717739cb6e7c3c4b34a245.zip
Remove default parameters from map.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/map/map.cpp20
-rw-r--r--src/resources/map/map.h10
2 files changed, 19 insertions, 11 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 8477b026e..39365643d 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -1180,18 +1180,26 @@ void Map::addExtraLayer() restrict2
}
if (type == MapItemType::PORTAL)
{
- updatePortalTile(comment, type, atoi(x.c_str()),
- atoi(y.c_str()), false);
+ updatePortalTile(comment,
+ type,
+ atoi(x.c_str()),
+ atoi(y.c_str()),
+ false);
}
else if (type == MapItemType::HOME)
{
- updatePortalTile(comment, type, atoi(x.c_str()),
- atoi(y.c_str()));
+ updatePortalTile(comment,
+ type,
+ atoi(x.c_str()),
+ atoi(y.c_str()),
+ true);
}
else
{
- addPortalTile(comment, type, atoi(x.c_str()),
- atoi(y.c_str()));
+ addPortalTile(comment,
+ type,
+ atoi(x.c_str()),
+ atoi(y.c_str()));
}
}
}
diff --git a/src/resources/map/map.h b/src/resources/map/map.h
index dc05cb2ea..39e4e651e 100644
--- a/src/resources/map/map.h
+++ b/src/resources/map/map.h
@@ -95,7 +95,7 @@ class Map final : public Properties,
/**
* Updates animations. Called as needed.
*/
- void update(const int ticks = 1) restrict2;
+ void update(const int ticks) restrict2;
/**
* Draws the map to the given graphics output. This method draws all
@@ -199,7 +199,7 @@ class Map final : public Properties,
Path findPath(const int startX, const int startY,
const int destX, const int destY,
const unsigned char blockWalkmask,
- const int maxCost = 20) restrict2 A_WARN_UNUSED;
+ const int maxCost) restrict2 A_WARN_UNUSED;
/**
* Adds a particle effect
@@ -207,8 +207,8 @@ class Map final : public Properties,
void addParticleEffect(const std::string &restrict effectFile,
const int x,
const int y,
- const int w = 0,
- const int h = 0) restrict2;
+ const int w,
+ const int h) restrict2;
/**
* Initializes all added particle effects
@@ -262,7 +262,7 @@ class Map final : public Properties,
void updatePortalTile(const std::string &restrict name,
const int type,
const int x, const int y,
- const bool addNew = true) restrict2;
+ const bool addNew) restrict2;
const STD_VECTOR<MapItem*> &getPortals() const restrict2 noexcept2
A_WARN_UNUSED