Merge remote-tracking branch 'dclamage/initialize-variables'

Author: LocalIdentity

engine/common.h

@@ -15,6 +15,7 @@
 #include <math.h>
 #include <io.h>
 #include <errno.h>
+#include <stdbool.h>
 
 #ifdef _DEBUG
 #include "common/memtrak3.h"

engine/common/console.h

@@ -40,16 +40,16 @@ enum conVarFlags_e {
 // Cvar
 class conVar_c {
 public:
-	char*	name;		// Cvar name
-	int		flags;		// Flags
-	bool	mod;		// Modified?
+	char*	name = nullptr;		// Cvar name
+	int		flags = 0;			// Flags
+	bool	mod = false;		// Modified?
 
-	int		intVal;		// Integer value
-	float	floatVal;	// Float value
-	char*	strVal;		// String value
+	int		intVal = 0;			// Integer value
+	float	floatVal = 0.f;		// Float value
+	char*	strVal = nullptr;	// String value
 
-	char*	defVal;		// Default string
-	int		min, max;	// Clamp limits
+	char*	defVal = nullptr;	// Default string
+	int		min = 0, max = 0;	// Clamp limits
 
 	conVar_c(IConsole* conHnd);
 	~conVar_c();

engine/core/core_config.cpp

@@ -193,7 +193,7 @@ bool core_config_c::LoadConfig(const char* cfgName)
 		}
 	}
 
-	delete cfg;
+	delete[] cfg;
 	return false;
 }
 

engine/core/core_image.cpp

@@ -11,9 +11,6 @@
 #include "_lib/jpeglib.h"
 #include "_lib/tiffio.h"
 #include "_lib/png.h"
-#ifndef __bool_true_false_are_defined
-#define __bool_true_false_are_defined
-#endif
 #include "_lib/gif_lib.h"
 
 // =======
@@ -61,22 +58,22 @@ void image_c::Free()
 	dat = NULL;
 }
 
-bool image_c::Load(char* fileName) 
+bool image_c::Load(const char* fileName) 
 {
 	return true; // o_O
 }
 
-bool image_c::Save(char* fileName) 
+bool image_c::Save(const char* fileName) 
 {
 	return true; // o_O
 }
 
-bool image_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool image_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	return true; // o_O
 }
 
-image_c* image_c::LoaderForFile(IConsole* conHnd, char* fileName)
+image_c* image_c::LoaderForFile(IConsole* conHnd, const char* fileName)
 {
 	fileInputStream_c in;
 	if (in.FileOpen(fileName, true)) {
@@ -131,7 +128,7 @@ struct tgaHeader_s {
 };
 #pragma pack(pop)
 
-bool targa_c::Load(char* fileName)
+bool targa_c::Load(const char* fileName)
 {
 	Free();
 
@@ -214,7 +211,7 @@ bool targa_c::Load(char* fileName)
 	return false;
 }
 
-bool targa_c::Save(char* fileName)
+bool targa_c::Save(const char* fileName)
 {
 	// Find a suitable image type
 	int ittable[3][3] = {
@@ -313,7 +310,7 @@ bool targa_c::Save(char* fileName)
 			}
 			line.MemOutput(&out);
 		}
-		delete packet;
+		delete[] packet;
 	} else {
 		// Raw
 		for (int y = height - 1; y >= 0; y--) {
@@ -324,7 +321,7 @@ bool targa_c::Save(char* fileName)
 	return false;
 }
 
-bool targa_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool targa_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;
@@ -382,8 +379,8 @@ struct jpegError_s: public jpeg_error_mgr {
 // JPEG Reading
 
 struct jpegRead_s: public jpeg_source_mgr {
-	ioStream_c* in;
-	byte buffer[1024];
+	ioStream_c* in = nullptr;
+	byte buffer[1024] = {};
 	jpegRead_s(ioStream_c* in)
 		: in(in)
 	{
@@ -432,7 +429,7 @@ struct jpegRead_s: public jpeg_source_mgr {
 	}
 };
 
-bool jpeg_c::Load(char* fileName)
+bool jpeg_c::Load(const char* fileName)
 {
 	Free();
 
@@ -486,7 +483,7 @@ bool jpeg_c::Load(char* fileName)
 	} 
 	catch (...) {
 	}
-	delete rows;
+	delete[] rows;
 
 	jpeg_destroy_decompress(&jdecomp);
 	return false;
@@ -495,8 +492,8 @@ bool jpeg_c::Load(char* fileName)
 // JPEG Writing
 
 struct jpegWrite_s: public jpeg_destination_mgr {
-	ioStream_c* out;
-	byte buffer[1024];
+	ioStream_c* out = nullptr;
+	byte buffer[1024] = {};
 	jpegWrite_s(ioStream_c* out)
 		: out(out)
 	{
@@ -525,7 +522,7 @@ struct jpegWrite_s: public jpeg_destination_mgr {
 	}
 };
 
-bool jpeg_c::Save(char* fileName)
+bool jpeg_c::Save(const char* fileName)
 {
 	// JPEG only supports RGB and grayscale images
 	if (type != IMGTYPE_RGB && type != IMGTYPE_GRAY) {
@@ -580,15 +577,15 @@ bool jpeg_c::Save(char* fileName)
 	catch (...) {
 		dst.Term(&jcomp);
 	}
-	delete rows;
+	delete[] rows;
 
 	jpeg_destroy_compress(&jcomp);
 	return false;
 }
 
 // JPEG Image Info
 
-bool jpeg_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool jpeg_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;
@@ -677,7 +674,7 @@ static toff_t ITIFF_SizeProc(thandle_t clientData)
 	return cd->io->GetLen();
 }
 
-bool tiff_c::Load(char* fileName)
+bool tiff_c::Load(const char* fileName)
 {
 	Free();
 
@@ -712,7 +709,7 @@ bool tiff_c::Load(char* fileName)
 	return ret;
 }
 
-bool tiff_c::Save(char* fileName)
+bool tiff_c::Save(const char* fileName)
 {
 	// Only save RGB or RGBA
 	if (type != IMGTYPE_RGB && type != IMGTYPE_RGBA) {
@@ -753,7 +750,7 @@ bool tiff_c::Save(char* fileName)
 	return false;
 }
 
-bool tiff_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool tiff_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;
@@ -804,7 +801,7 @@ static void IPNG_ReadProc(png_structp png, png_bytep data, png_size_t len)
 	}
 }
 
-bool png_c::Load(char* fileName)
+bool png_c::Load(const char* fileName)
 {
 	Free();
 
@@ -875,7 +872,7 @@ static void IPNG_FlushProc(png_structp png)
 	out->FileFlush();
 }
 
-bool png_c::Save(char* fileName)
+bool png_c::Save(const char* fileName)
 {
 	if (type != IMGTYPE_RGB && type != IMGTYPE_RGBA) {
 		return true;
@@ -907,15 +904,15 @@ bool png_c::Save(char* fileName)
 	}
 	png_set_rows(png, pnginfo, rows);
 	png_write_png(png, pnginfo, PNG_TRANSFORM_IDENTITY, NULL);
-	delete rows;
+	delete[] rows;
 
 	png_destroy_write_struct(&png, &pnginfo);
 	return false;
 }
 
 // PNG Image Info
 
-bool png_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool png_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open file and check signature
 	fileInputStream_c in;
@@ -973,7 +970,7 @@ static int IGIF_ReadProc(GifFileType* gif, GifByteType* buf, int len)
 	return len;
 }
 
-bool gif_c::Load(char* fileName)
+bool gif_c::Load(const char* fileName)
 {
 	// Open file
 	fileInputStream_c in;
@@ -1025,13 +1022,13 @@ bool gif_c::Load(char* fileName)
 	return false;
 }
 
-bool gif_c::Save(char* fileName)
+bool gif_c::Save(const char* fileName)
 {
 	// HELL no.
 	return true;
 }
 
-bool gif_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool gif_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	return true;
 }
@@ -1063,7 +1060,7 @@ struct blpMipmapHeader_s {
 };
 #pragma pack(pop)
 
-bool blp_c::Load(char* fileName)
+bool blp_c::Load(const char* fileName)
 {
 	Free();
 
@@ -1113,7 +1110,7 @@ bool blp_c::Load(char* fileName)
 
 	// Read image
 	int isize = 0;
-	int numMip;
+	int numMip = 0;
 	for (int c = 0; c < 16; c++) {
 		if (mip.size[c] == 0) {
 			numMip = c;
@@ -1134,13 +1131,13 @@ bool blp_c::Load(char* fileName)
 	return false;
 }
 
-bool blp_c::Save(char* fileName)
+bool blp_c::Save(const char* fileName)
 {
 	// No.
 	return true;
 }
 
-bool blp_c::ImageInfo(char* fileName, imageInfo_s* info)
+bool blp_c::ImageInfo(const char* fileName, imageInfo_s* info)
 {
 	// Open the file
 	fileInputStream_c in;