Merge Sprite loading notifications

Because they are pretty much the same thing.
This commit is contained in:
Thiago Marcos P. Santos
2015-07-09 14:13:42 +03:00
parent efa7dad89c
commit f64ba78910
4 changed files with 6 additions and 10 deletions

View File

@@ -86,9 +86,10 @@ Sprite::~Sprite() {
void Sprite::emitSpriteLoadedIfComplete() {
assert(loader);
if (loader->loadedImage && loader->loadedJSON && observer) {
observer->onSpriteDataLoaded(std::move(loader->data));
std::unique_ptr<Data> data(std::move(loader->data));
loader.reset();
observer->onSpriteLoaded();
observer->onSpriteLoaded(std::move(data));
}
}