eukara
/
fteqw
forked from fte/fteqw
1
0
Fork 0
Code Pull Requests Activity

fixed some minor issues 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1337 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-09-15 05:55:43 +00:00
parent ca11c54292
commit 13cade8fe9
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/Makefile
View File

@ -456,6 +456,8 @@ endif
MINGL_EXE_NAME=../fteqw.mingl
MINGL_DIR=mingl_linux
endif endif
SV_DIR?=sv_sdl SV_DIR?=sv_sdl
@ -533,8 +535,8 @@ gl-dbg:
$(MAKE) gl-tmp TYPE=_clsv-dbg OUT_DIR="$(DEBUG_DIR)/$(GLB_DIR)" $(MAKE) gl-tmp TYPE=_clsv-dbg OUT_DIR="$(DEBUG_DIR)/$(GLB_DIR)"
mingl-tmp: mingl-tmp: reldir
$(MAKE) $(TYPE) OUT_DIR="$(OUT_DIR)" EXE_NAME=$(MINGL_EXE_NAME)" WCFLAGS="$(GL_CFLAGS) -DMINIMAL" LDFLAGS="$(GL_LDFLAGS)" SOBJS="$(GLCL_OBJS)" $(MAKE) $(TYPE) OUT_DIR="$(OUT_DIR)" EXE_NAME="$(MINGL_EXE_NAME)" WCFLAGS="$(GL_CFLAGS) -DMINIMAL" LDFLAGS="$(GL_LDFLAGS)" SOBJS="$(GLCL_OBJS)"
mingl-rel: mingl-rel:
$(MAKE) mingl-tmp TYPE=_cl-rel OUT_DIR="$(RELEASE_DIR)/$(MINGL_DIR)" $(MAKE) mingl-tmp TYPE=_cl-rel OUT_DIR="$(RELEASE_DIR)/$(MINGL_DIR)"

6
engine/gl/gl_draw.c
View File

@ -3274,8 +3274,12 @@ void GL_Upload8 (qbyte *data, int width, int height, qboolean mipmap, qboolean
{ {
p = data[i]; p = data[i];
if (p == 255) if (p == 255)
{
noalpha = false; noalpha = false;
trans[i] = d_8to24rgbtable[p]; trans[i] = 0;
}
else
trans[i] = d_8to24rgbtable[p];
} }
switch( alpha ) switch( alpha )

6
engine/qclib/execloop.h
View File

@ -524,6 +524,12 @@ reeval:
if (newf->first_statement < 0) if (newf->first_statement < 0)
{ // negative statements are built in functions { // negative statements are built in functions
if (pr_typecurrent != 0)
{
PR_MoveParms(progfuncs, 0, pr_typecurrent);
PR_SwitchProgs(progfuncs, 0);
}
i = -newf->first_statement; i = -newf->first_statement;
// p = pr_typecurrent; // p = pr_typecurrent;
progfuncs->lastcalledbuiltinnumber = i; progfuncs->lastcalledbuiltinnumber = i;

8
engine/qclib/qcc_pr_lex.c
View File

@ -174,10 +174,12 @@ void QCC_FindBestInclude(char *newfile, char *currentfile, char *rootpath)
if (*stripfrom == '/' || *stripfrom == '\\') if (*stripfrom == '/' || *stripfrom == '\\')
break; break;
} }
strcpy(end, rootpath); end = end+strlen(end); strcpy(end, rootpath); end = end+strlen(end);
if (*fullname) if (*fullname && end[-1] != '/')
strcpy(end, "/"); end = end+strlen(end); {
strcpy(end, "/");
end = end+strlen(end);
}
strncpy(end, currentfile, stripfrom - currentfile); end += stripfrom - currentfile; *end = '\0'; strncpy(end, currentfile, stripfrom - currentfile); end += stripfrom - currentfile; *end = '\0';
strcpy(end, newfile); strcpy(end, newfile);