summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-12-17 23:49:00 +0300
committerAndrei Karas <akaras@inbox.ru>2017-12-17 23:49:00 +0300
commitbad30239e412c4e31aa8929039eaebc615d220ec (patch)
tree9e822218dac67707ac2d30b56c559e4c357c07b0
parent6a39f295e9e2c94dfcd3ce4c90415ae6bce20ef6 (diff)
downloadmv-bad30239e412c4e31aa8929039eaebc615d220ec.tar.gz
mv-bad30239e412c4e31aa8929039eaebc615d220ec.tar.bz2
mv-bad30239e412c4e31aa8929039eaebc615d220ec.tar.xz
mv-bad30239e412c4e31aa8929039eaebc615d220ec.zip
Remove default parameters from spritedef.
-rw-r--r--src/resources/sprite/spritedef.cpp2
-rw-r--r--src/resources/sprite/spritedef.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp
index aa79ef9f8..afa749cdb 100644
--- a/src/resources/sprite/spritedef.cpp
+++ b/src/resources/sprite/spritedef.cpp
@@ -516,7 +516,7 @@ void SpriteDef::includeSprite(XmlNodeConstPtr includeNode, const int variant)
return;
}
- loadSprite(rootNode, variant);
+ loadSprite(rootNode, variant, std::string());
doc->decRef();
}
diff --git a/src/resources/sprite/spritedef.h b/src/resources/sprite/spritedef.h
index fcb019d31..b2fceb2be 100644
--- a/src/resources/sprite/spritedef.h
+++ b/src/resources/sprite/spritedef.h
@@ -102,7 +102,7 @@ class SpriteDef final : public Resource
*/
void loadSprite(XmlNodeConstPtr spriteNode,
const int variant,
- const std::string &palettes = "");
+ const std::string &palettes);
/**
* Loads an imageset element.