From 13cade8fe991cf126c29304151aad69fc970d783 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Thu, 15 Sep 2005 05:55:43 +0000
Subject: [PATCH] fixed some minor issues

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1337 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/Makefile           | 6 ++++--
 engine/gl/gl_draw.c       | 6 +++++-
 engine/qclib/execloop.h   | 6 ++++++
 engine/qclib/qcc_pr_lex.c | 8 +++++---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/engine/Makefile b/engine/Makefile
index 4b7623e67..20c571985 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -456,6 +456,8 @@ endif
 
 
 
+	MINGL_EXE_NAME=../fteqw.mingl
+	MINGL_DIR=mingl_linux
 endif
 
 SV_DIR?=sv_sdl
@@ -533,8 +535,8 @@ gl-dbg:
 	$(MAKE) gl-tmp TYPE=_clsv-dbg OUT_DIR="$(DEBUG_DIR)/$(GLB_DIR)"
 
 
-mingl-tmp:
-	$(MAKE) $(TYPE) OUT_DIR="$(OUT_DIR)" EXE_NAME=$(MINGL_EXE_NAME)" WCFLAGS="$(GL_CFLAGS) -DMINIMAL" LDFLAGS="$(GL_LDFLAGS)" SOBJS="$(GLCL_OBJS)"
+mingl-tmp: reldir
+	$(MAKE) $(TYPE) OUT_DIR="$(OUT_DIR)" EXE_NAME="$(MINGL_EXE_NAME)" WCFLAGS="$(GL_CFLAGS) -DMINIMAL" LDFLAGS="$(GL_LDFLAGS)" SOBJS="$(GLCL_OBJS)"
 mingl-rel:
 	$(MAKE) mingl-tmp TYPE=_cl-rel OUT_DIR="$(RELEASE_DIR)/$(MINGL_DIR)"
 
diff --git a/engine/gl/gl_draw.c b/engine/gl/gl_draw.c
index 4384c5189..632fd711c 100644
--- a/engine/gl/gl_draw.c
+++ b/engine/gl/gl_draw.c
@@ -3274,8 +3274,12 @@ void GL_Upload8 (qbyte *data, int width, int height,  qboolean mipmap, qboolean
 		{
 			p = data[i];
 			if (p == 255)
+			{
 				noalpha = false;
-			trans[i] = d_8to24rgbtable[p];
+				trans[i] = 0;
+			}
+			else
+				trans[i] = d_8to24rgbtable[p];
 		}
 
 		switch( alpha )
diff --git a/engine/qclib/execloop.h b/engine/qclib/execloop.h
index f7186ec73..c4ff88f74 100644
--- a/engine/qclib/execloop.h
+++ b/engine/qclib/execloop.h
@@ -524,6 +524,12 @@ reeval:
 
 		if (newf->first_statement < 0)
 		{	// negative statements are built in functions
+
+if (pr_typecurrent != 0)
+{
+	PR_MoveParms(progfuncs, 0, pr_typecurrent);
+	PR_SwitchProgs(progfuncs, 0);
+}
 			i = -newf->first_statement;
 //			p = pr_typecurrent;
 			progfuncs->lastcalledbuiltinnumber = i;
diff --git a/engine/qclib/qcc_pr_lex.c b/engine/qclib/qcc_pr_lex.c
index 95f3b3ae7..c582e3d2f 100644
--- a/engine/qclib/qcc_pr_lex.c
+++ b/engine/qclib/qcc_pr_lex.c
@@ -174,10 +174,12 @@ void QCC_FindBestInclude(char *newfile, char *currentfile, char *rootpath)
 		if (*stripfrom == '/' || *stripfrom == '\\')
 			break;
 	}
-
 	strcpy(end, rootpath); end = end+strlen(end);
-	if (*fullname)
-		strcpy(end, "/"); end = end+strlen(end);
+	if (*fullname && end[-1] != '/')
+	{
+		strcpy(end, "/");
+		end = end+strlen(end);
+	}
 	strncpy(end, currentfile, stripfrom - currentfile); end += stripfrom - currentfile; *end = '\0';
 	strcpy(end, newfile);