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

Didn't test all targets.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3196 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-05-24 10:28:26 +00:00
parent 9cd988a836
commit 0afe8f9dc5
7 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/client/cl_parse.c
View file

@ -4289,7 +4289,11 @@ void CL_PrintChat(player_info_t *plr, char *rawmsg, char *msg, int plrflags)
Q_strncatz(fullchatmessage, va("%s", msg), sizeof(fullchatmessage)); Q_strncatz(fullchatmessage, va("%s", msg), sizeof(fullchatmessage));
} }
CSQC_ParsePrint(fullchatmessage, PRINT_CHAT); #ifdef CSQC_DAT
if (CSQC_ParsePrint(fullchatmessage, PRINT_CHAT))
return;
#endif
Con_Printf("%s", fullchatmessage);
} }
// CL_PrintStandardMessage: takes non-chat net messages and performs name coloring // CL_PrintStandardMessage: takes non-chat net messages and performs name coloring
@ -4369,7 +4373,11 @@ void CL_PrintStandardMessage(char *msg, int printlevel)
// print final chunk // print final chunk
Q_strncatz(fullmessage, msg, sizeof(fullmessage)); Q_strncatz(fullmessage, msg, sizeof(fullmessage));
CSQC_ParsePrint(fullmessage, printlevel); #ifdef CSQC_DAT
if (CSQC_ParsePrint(fullmessage, printlevel))
return;
#endif
Con_Printf("%s", fullmessage);
} }
char stufftext[4096]; char stufftext[4096];

2
engine/client/m_multi.c
View file

@ -282,7 +282,7 @@ void MSetup_TransDraw (int x, int y, menucustom_t *option, menu_t *menu)
{ {
info->tiwidth = ((int*)f)[0]; info->tiwidth = ((int*)f)[0];
info->tiheight = ((int*)f)[1]; info->tiheight = ((int*)f)[1];
memcpy(info->translationimage, f+8, info->tiwidth*info->tiheight); memcpy(info->translationimage, (char*)f+8, info->tiwidth*info->tiheight);
FS_FreeFile(f); FS_FreeFile(f);
} }
} }

6
engine/client/pr_csqc.c
View file

@ -6025,7 +6025,7 @@ qboolean CSQC_LoadResource(char *resname, char *restype)
return !!G_FLOAT(OFS_RETURN); return !!G_FLOAT(OFS_RETURN);
} }
void CSQC_ParsePrint(char *message, int printlevel) qboolean CSQC_ParsePrint(char *message, int printlevel)
{ {
void *pr_globals; void *pr_globals;
int bufferpos; int bufferpos;
@ -6033,8 +6033,7 @@ void CSQC_ParsePrint(char *message, int printlevel)
qboolean doflush; qboolean doflush;
if (!csqcprogs || !csqcg.parse_print) if (!csqcprogs || !csqcg.parse_print)
{ {
Con_Printf("%s", message); return false;
return;
} }
bufferpos = strlen(csqc_printbuffer); bufferpos = strlen(csqc_printbuffer);
@ -6081,6 +6080,7 @@ void CSQC_ParsePrint(char *message, int printlevel)
csqc_printbuffer[bufferpos] = 0; csqc_printbuffer[bufferpos] = 0;
} }
} }
return true;
} }
qboolean CSQC_StuffCmd(int lplayernum, char *cmd) qboolean CSQC_StuffCmd(int lplayernum, char *cmd)

6
engine/common/common.c
View file

@ -2874,7 +2874,11 @@ void COM_Version_f (void)
else if (_MSC_VER == 1500) { Con_Printf("Visual C++ 2008, version 9.0\n"); } else if (_MSC_VER == 1500) { Con_Printf("Visual C++ 2008, version 9.0\n"); }
else else
{ {
Con_Printf("Unknown Microsoft C++ compiler: %i %i %i \n",_MSC_VER, _MSC_FULL_VER, _MSC_BUILD); #ifdef _MSC_BUILD
Con_Printf("Unknown Microsoft C++ compiler: %i %i %i\n",_MSC_VER, _MSC_FULL_VER, _MSC_BUILD);
#else
Con_Printf("Unknown Microsoft C++ compiler: %i %i\n",_MSC_VER, _MSC_FULL_VER);
#endif
} }
#endif #endif
} }

2
engine/common/fs_win32.c
View file

@ -119,6 +119,8 @@ vfsfile_t *VFSW32_Open(const char *osname, const char *mode)
h = CreateFileA(osname, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); h = CreateFileA(osname, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
else if (read) else if (read)
h = CreateFileA(osname, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); h = CreateFileA(osname, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
else
h = INVALID_HANDLE_VALUE;
if (h == INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)
return NULL; return NULL;

3
engine/gl/gl_ppl.c
View file

@ -1651,7 +1651,10 @@ static void PPL_BaseChain_NPR_Sketch(msurface_t *first)
static void PPL_BaseTextureChain(msurface_t *first) static void PPL_BaseTextureChain(msurface_t *first)
{ {
texture_t *t; texture_t *t;
#ifdef Q3SHADERS
shader_t *shader; shader_t *shader;
#endif
if (r_drawflat.value||!r_lightmapintensity) if (r_drawflat.value||!r_lightmapintensity)
{ {
if (r_drawflat.value == 2) if (r_drawflat.value == 2)

2
engine/gl/gl_rsurf.c
View file

@ -3553,7 +3553,7 @@ void GL_GenBrushModelVBO(model_t *mod)
void *vbovdata; void *vbovdata;
index_t *vboedata; index_t *vboedata;
mesh_t *m; mesh_t *m;
#define VBOSTRIDE (3+2+2)*4
if (!qglGenBuffersARB || !mod->numsurfaces) if (!qglGenBuffersARB || !mod->numsurfaces)
return; return;