From 141a6b8304cb7a55cad08cd1de379e43ca83b38b Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 15 Jun 2009 20:09:19 +0000 Subject: 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 --- crawl-ref/source/tiletex.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/tiletex.cc') 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); -- cgit v1.2.3-54-g00ecf