Renamed mtk_tga to tga

Makefile

@@ -31,7 +31,7 @@ UNAME=$(shell uname -s)
 
 BASE_DEFS=$(shell sdl-config --cflags) -Iinclude -DSDL_INTERFACE \
 	-DUSING_OPENGL -DZLIB_SUPPORT -DUSING_EMITTER \
-	-DUSING_OPENAL -DUSING_MTK_TGA -DUSING_PTHREADS \
+	-DUSING_OPENAL -DUSING_TGA -DUSING_PTHREADS \
 	-DHAVE_SDL_TTF
 
 BASE_LIBS=$(shell sdl-config --libs) -lz -lstdc++ \
@@ -182,7 +182,7 @@ OBJS = \
 	$(BUILDDIR)/GLString.o \
 	$(BUILDDIR)/MatMath.o \
 	$(BUILDDIR)/Matrix.o \
-	$(BUILDDIR)/mtk_tga.o \
+	$(BUILDDIR)/tga.o \
 	$(BUILDDIR)/Network.o \
 	$(BUILDDIR)/OpenGLMesh.o \
 	$(BUILDDIR)/OpenRaider.o \
@@ -297,7 +297,7 @@ TombRaider.test:
 	@-mkdir -p $(BUILD_TEST_DIR)
 	$(CC) -Wall -Iinclude $(TR_FLAGS) -o $(BUILD_TEST_DIR)/TombRaiderTest.o -c test/TombRaider.cpp
 	$(MAKE) targets NAME=TombRaider.test BUILDDIR=$(BUILD_TEST_DIR) \
-	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/mtk_tga.o $(BUILD_TEST_DIR)/memory_test.o" \
+	OBJS="$(BUILD_TEST_DIR)/TombRaiderTest.o $(BUILD_TEST_DIR)/TombRaider.o $(BUILD_TEST_DIR)/tga.o $(BUILD_TEST_DIR)/memory_test.o" \
 	CFLAGS="$(BASE_CFLAGS) -g $(TR_FLAGS)" \
 	LD_FLAGS="-lz -lstdc++"
 
@@ -371,7 +371,7 @@ Sound.test:
 TGA.test:
 	mkdir -p $(BUILD_TEST_DIR)
 	$(CC) $(TEST_FLAGS) \
-		src/mtk_tga.cpp test/mtk_tga.cpp -o $(BUILD_TEST_DIR)/TGA.test
+		src/tga.cpp test/tga.cpp -o $(BUILD_TEST_DIR)/TGA.test
 
 #################################################################
 

include/mtk_tga.h → include/tga.h

@@ -19,8 +19,8 @@
  * Mongoose - Created
  ================================================================*/
 
-#ifndef _MTK_TGA_H
-#define _MTK_TGA_H
+#ifndef _TGA_H
+#define _TGA_H
 
 #include <stdio.h>
 

src/Texture.cpp

@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*==========================================================================
  *
- * Project : MTK, Freyja, OpenRaider
+ * Project : Freyja, OpenRaider
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440
  * Email   : stu7440@westga.edu
@@ -37,12 +37,12 @@
 #include <memory_test.h>
 #endif
 
-#ifdef USING_MTK_TGA
-#include <mtk_tga.h>
+#ifdef USING_TGA
+#include <tga.h>
 #endif
 
-#ifdef USING_MTK_PNG
-#include <mtk_png.h>
+#ifdef USING_PNG
+#include <png.h>
 #endif
 
 #ifdef HAVE_SDL_TTF
@@ -831,7 +831,7 @@ void Texture::bindTextureId(unsigned int n)
 
 void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
 {
-#ifdef USING_MTK_PNG
+#ifdef USING_PNG
   FILE *f;
   int sz = width*height;
   unsigned char *image = new unsigned char[sz*3];
@@ -1002,7 +1002,7 @@ void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
 
 int Texture::loadPNG(const char *filename)
 {
-#ifdef USING_MTK_PNG
+#ifdef USING_PNG
 	FILE *f;
 	unsigned char *image = NULL;
 	unsigned char *image2 = NULL;
@@ -1053,7 +1053,7 @@ int Texture::loadPNG(const char *filename)
 
 	return id;
 #else
-	printf("ERROR: MTK PNG support not enabled in this build\n");
+	printf("ERROR: PNG support not enabled in this build\n");
 	return -1;
 #endif
 }
@@ -1061,7 +1061,7 @@ int Texture::loadPNG(const char *filename)
 
 int Texture::loadTGA(const char *filename)
 {
-#ifdef USING_MTK_TGA
+#ifdef USING_TGA
 	FILE *f;
 	unsigned char *image = NULL;
 	unsigned char *image2 = NULL;
@@ -1109,7 +1109,7 @@ int Texture::loadTGA(const char *filename)
 
 	return id;
 #else
-	printf("ERROR: MTK TGA support not enabled in this build\n");
+	printf("ERROR: TGA support not enabled in this build\n");
 	return -1;
 #endif
 }

src/TombRaider.cpp

@@ -59,7 +59,7 @@
 #endif
 
 #ifdef __TEST_TR5_DUMP_TGA
-#include <mtk_tga.h>
+#include <tga.h>
 #endif
 
 #ifdef DEBUG_MEMORY

src/mtk_tga.cpp → src/tga.cpp

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <mtk_tga.h>
+#include <tga.h>
 
 #ifdef DEBUG_MEMORY
 #include <memory_test.h>

test/mtk_tga.cpp → test/tga.cpp

@@ -1,12 +1,12 @@
 /*!
- * \file test/mtk_tga.cpp
+ * \file test/tga.cpp
  * \brief The TGA reader Unit Test
  *
  * \author xythobuz
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <mtk_tga.h>
+#include <tga.h>
 #include "greatest.h"
 
 //! \todo generate list?