diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-23 01:42:15 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-23 01:42:15 +0000 |
commit | cf4c73f2a75b470a4d4c4167105f92bc46f1926c (patch) | |
tree | a697de87564846e784fd1256d71c94270d8ec51d /yage/core/spritesheet.cpp | |
parent | 278757a11e50e94e234f339d9d072a0d837dcb06 (diff) | |
parent | ddd26ed83d3ac0335562f762ced273a1d62bd959 (diff) | |
download | YAGE-cf4c73f2a75b470a4d4c4167105f92bc46f1926c.tar.gz YAGE-cf4c73f2a75b470a4d4c4167105f92bc46f1926c.zip |
Merge branch 'develop'v0.1.3
Diffstat (limited to 'yage/core/spritesheet.cpp')
-rw-r--r-- | yage/core/spritesheet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/yage/core/spritesheet.cpp b/yage/core/spritesheet.cpp index 7fbd19e9..4ecdcf71 100644 --- a/yage/core/spritesheet.cpp +++ b/yage/core/spritesheet.cpp @@ -55,7 +55,7 @@ SpriteMap SpriteSheet::parseJson(int &width, int &height, Document jsonAtlas; jsonAtlas.Parse(jsonContent.c_str()); - width = jsonAtlas["width"].GetInt(); + width = jsonAtlas["width"].GetInt(); height = jsonAtlas["height"].GetInt(); for (auto &texture : jsonAtlas["sprites"].GetObject()) { |