aboutsummaryrefslogtreecommitdiffstats
path: root/code/renderer/tr_image.c
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-02-14 13:16:13 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-02-14 13:16:13 +0000
commit8427f7edac0d0f21cbc78a7b52093733e28371a3 (patch)
tree0e8df0659c1009221bc27676bd2845c10d4e466a /code/renderer/tr_image.c
parent2a334a454a1b21f490f1a6f38e642d7d6fb259ff (diff)
downloadioquake3-aero-8427f7edac0d0f21cbc78a7b52093733e28371a3.tar.gz
ioquake3-aero-8427f7edac0d0f21cbc78a7b52093733e28371a3.zip
* Consolidate tr_image_*.h headers into tr_local.h to more closely follow the
Q3 coding style * Prefix image loaders with R_ now they're non-static git-svn-id: svn://svn.icculus.org/quake3/trunk@1261 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/renderer/tr_image.c')
-rw-r--r--code/renderer/tr_image.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
index 81a478e..339d91c 100644
--- a/code/renderer/tr_image.c
+++ b/code/renderer/tr_image.c
@@ -22,13 +22,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// tr_image.c
#include "tr_local.h"
-
-#include "tr_image_bmp.h"
-#include "tr_image_jpg.h"
-#include "tr_image_pcx.h"
-#include "tr_image_png.h"
-#include "tr_image_tga.h"
-
static byte s_intensitytable[256];
static unsigned char s_gammatable[256];
@@ -801,12 +794,12 @@ typedef struct
// when there are multiple images of different formats available
static imageExtToLoaderMap_t imageLoaders[ ] =
{
- { "tga", LoadTGA },
- { "jpg", LoadJPG },
- { "jpeg", LoadJPG },
- { "png", LoadPNG },
- { "pcx", LoadPCX },
- { "bmp", LoadBMP }
+ { "tga", R_LoadTGA },
+ { "jpg", R_LoadJPG },
+ { "jpeg", R_LoadJPG },
+ { "png", R_LoadPNG },
+ { "pcx", R_LoadPCX },
+ { "bmp", R_LoadBMP }
};
static int numImageLoaders = sizeof( imageLoaders ) /