This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 9688ed7cc6222533c4de19097f8cfae479a4fe9a
Author: MAN-AT-ARMS <m4n4t4...@gmail.com>
Date: Sun Dec 20 16:56:35 2015 -0500
All: Rend2: Sync tr_image_*.c files with OpenGL1
---
MP/code/rend2/tr_image_bmp.c | 6 +-----
MP/code/rend2/tr_image_pcx.c | 6 +-----
MP/code/rend2/tr_image_png.c | 6 +-----
MP/code/rend2/tr_image_tga.c | 6 +-----
SP/code/rend2/tr_image_bmp.c | 6 +-----
SP/code/rend2/tr_image_pcx.c | 6 +-----
SP/code/rend2/tr_image_png.c | 6 +-----
SP/code/rend2/tr_image_tga.c | 6 +-----
8 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/MP/code/rend2/tr_image_bmp.c b/MP/code/rend2/tr_image_bmp.c
index c793674..7cb74c7 100644
--- a/MP/code/rend2/tr_image_bmp.c
+++ b/MP/code/rend2/tr_image_bmp.c
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
typedef struct
{
diff --git a/MP/code/rend2/tr_image_pcx.c b/MP/code/rend2/tr_image_pcx.c
index 388e6d1..ae9e43b 100644
--- a/MP/code/rend2/tr_image_pcx.c
+++ b/MP/code/rend2/tr_image_pcx.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
/*
========================================================================
diff --git a/MP/code/rend2/tr_image_png.c b/MP/code/rend2/tr_image_png.c
index 16c00a3..b291d93 100644
--- a/MP/code/rend2/tr_image_png.c
+++ b/MP/code/rend2/tr_image_png.c
@@ -19,11 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
#include "../qcommon/puff.h"
diff --git a/MP/code/rend2/tr_image_tga.c b/MP/code/rend2/tr_image_tga.c
index 38bc37f..cab6eb3 100644
--- a/MP/code/rend2/tr_image_tga.c
+++ b/MP/code/rend2/tr_image_tga.c
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
/*
========================================================================
diff --git a/SP/code/rend2/tr_image_bmp.c b/SP/code/rend2/tr_image_bmp.c
index c793674..7cb74c7 100644
--- a/SP/code/rend2/tr_image_bmp.c
+++ b/SP/code/rend2/tr_image_bmp.c
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
typedef struct
{
diff --git a/SP/code/rend2/tr_image_pcx.c b/SP/code/rend2/tr_image_pcx.c
index 388e6d1..ae9e43b 100644
--- a/SP/code/rend2/tr_image_pcx.c
+++ b/SP/code/rend2/tr_image_pcx.c
@@ -21,11 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
/*
========================================================================
diff --git a/SP/code/rend2/tr_image_png.c b/SP/code/rend2/tr_image_png.c
index 16c00a3..b291d93 100644
--- a/SP/code/rend2/tr_image_png.c
+++ b/SP/code/rend2/tr_image_png.c
@@ -19,11 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
#include "../qcommon/puff.h"
diff --git a/SP/code/rend2/tr_image_tga.c b/SP/code/rend2/tr_image_tga.c
index 38bc37f..cab6eb3 100644
--- a/SP/code/rend2/tr_image_tga.c
+++ b/SP/code/rend2/tr_image_tga.c
@@ -20,11 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
===========================================================================
*/
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-extern refimport_t ri;
+#include "tr_local.h"
/*
========================================================================
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
