X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=image_png.c;h=5562cedaf7f275194db882857224c611971c5329;hb=d21ad272ad2c10c98373065fe37bdf91008288e4;hp=9c712d1556ea3913c87f35e94778e6cad165fab3;hpb=c965cf031dc4e7b2fcf7d61ac919bd53aca5d7db;p=xonotic%2Fdarkplaces.git

diff --git a/image_png.c b/image_png.c
index 9c712d15..5562ceda 100644
--- a/image_png.c
+++ b/image_png.c
@@ -26,7 +26,7 @@
 //
 //LadyHavoc: rewrote most of this.
 
-#include "quakedef.h"
+#include "darkplaces.h"
 #include "image.h"
 #include "image_png.h"
 
@@ -140,7 +140,7 @@ PNG_OpenLibrary
 Try to load the PNG DLL
 ====================
 */
-qboolean PNG_OpenLibrary (void)
+qbool PNG_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
@@ -172,16 +172,14 @@ qboolean PNG_OpenLibrary (void)
 		return true;
 
 	// Load the DLL
-	if(!Sys_LoadLibrary (dllnames, &png14_dll, pngfuncs))
-	{
-		if(qpng_access_version_number() / 100 >= 104)
-			return false;
-		if(!Sys_LoadLibrary (dllnames, &png_dll, png14funcs))
+	if(!Sys_LoadLibrary (dllnames, &png_dll, pngfuncs))
+		return false;
+	if(qpng_access_version_number() / 100 >= 104)
+		if(!Sys_LoadLibrary (dllnames, &png14_dll, png14funcs))
 		{
-			Sys_UnloadLibrary (&png14_dll);
+			Sys_UnloadLibrary (&png_dll);
 			return false;
 		}
-	}
 	return true;
 }
 
@@ -476,7 +474,7 @@ PNG_SaveImage_preflipped
 Save a preflipped PNG image to a file
 ====================
 */
-qboolean PNG_SaveImage_preflipped (const char *filename, int width, int height, qboolean has_alpha, unsigned char *data)
+qbool PNG_SaveImage_preflipped (const char *filename, int width, int height, qbool has_alpha, unsigned char *data)
 {
 	unsigned int offset, linesize;
 	qfile_t* file = NULL;