diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 20:09:19 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-15 20:09:19 +0000 |
| commit | 141a6b8304cb7a55cad08cd1de379e43ca83b38b (patch) | |
| tree | 56a1e039e771a49242d2c3ae3a3c4e3ceecb598f /crawl-ref/source/tiletex.cc | |
| parent | ceb4c8964c99e64f6adebad119e1bbbafafedd62 (diff) | |
| download | crawl-ref-141a6b8304cb7a55cad08cd1de379e43ca83b38b.tar.gz crawl-ref-141a6b8304cb7a55cad08cd1de379e43ca83b38b.zip | |
Apply my recent commits to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9984 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tiletex.cc')
| -rw-r--r-- | crawl-ref/source/tiletex.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc index 9f01a25456..faaf20f5b0 100644 --- a/crawl-ref/source/tiletex.cc +++ b/crawl-ref/source/tiletex.cc @@ -198,15 +198,13 @@ bool GenericTexture::load_texture(const char *filename, bool success = false; if (!proc || proc(pixels, new_width, new_height)) - { success |= load_texture(pixels, new_width, new_height, mip_opt); - } // If conversion has occurred, delete converted data. if (pixels != img->pixels) - delete pixels; + delete[] pixels; - m_orig_width = img->w; + m_orig_width = img->w; m_orig_height = img->h; SDL_FreeSurface(img); |