fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

small fixes to make stuff nicer, and more likly to build

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1253 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-08-26 23:55:09 +00:00
parent 1130dea569
commit c0ff57d388
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
engine/client/cl_ui.c
View file

@ -4,18 +4,7 @@
#include "cl_master.h" #include "cl_master.h"
#ifdef VM_UI #ifdef VM_UI
#ifdef Q3CLIENT
#include "clq3defs.h" #include "clq3defs.h"
#else
typedef struct {
int handle;
int modificationCount;
float value;
int integer;
char string[256];
} vmcvar_t;
#endif
void GLDraw_ShaderImage (int x, int y, int w, int h, float s1, float t1, float s2, float t2, struct shader_s *pic); void GLDraw_ShaderImage (int x, int y, int w, int h, float s1, float t1, float s2, float t2, struct shader_s *pic);
@ -1028,7 +1017,9 @@ long UI_SystemCallsEx(void *offset, unsigned int mask, int fn, const long *arg)
VM_LONG(ret) = 0; VM_LONG(ret) = 0;
break; //out of bounds. break; //out of bounds.
} }
#ifdef VM_CG
Q_strncpyz(VM_POINTER(arg[1]), CG_GetConfigString(VM_LONG(arg[0])), VM_LONG(arg[2])); Q_strncpyz(VM_POINTER(arg[1]), CG_GetConfigString(VM_LONG(arg[0])), VM_LONG(arg[2]));
#endif
break; break;
case UI_LAN_GETPINGQUEUECOUNT: //these four are master server polling. case UI_LAN_GETPINGQUEUECOUNT: //these four are master server polling.

6
engine/client/keys.c
View file

@ -1221,17 +1221,19 @@ void Key_Event (int key, qboolean down)
if (key == K_SHIFT) if (key == K_SHIFT)
shift_down = down; shift_down = down;
#ifdef CSQC_DAT
//yes, csqc is allowed to steal the escape key. //yes, csqc is allowed to steal the escape key.
if (key != '`' && key != '~') if (key != '`' && key != '~')
if (key_dest == key_game) if (key_dest == key_game)
{ {
#ifdef CSQC_DAT
if (CSQC_KeyPress(key, down)) //give csqc a chance to handle it. if (CSQC_KeyPress(key, down)) //give csqc a chance to handle it.
return; return;
#endif
#ifdef VM_CG
if (CG_KeyPress(key, down)) if (CG_KeyPress(key, down))
return; return;
}
#endif #endif
}
// //
// handle escape specialy, so the user can never unbind it // handle escape specialy, so the user can never unbind it

3
engine/common/common.c
View file

@ -1429,7 +1429,7 @@ void COM_CleanUpPath(char *str)
memmove(str, str+1, strlen(str+1)+1); memmove(str, str+1, strlen(str+1)+1);
critisize = 4; critisize = 4;
} }
if(critisize) /* if(critisize)
{ {
if (critisize == 1) //not a biggy, so not red. if (critisize == 1) //not a biggy, so not red.
Con_Printf("Please fix file case on your files\n"); Con_Printf("Please fix file case on your files\n");
@ -1440,6 +1440,7 @@ void COM_CleanUpPath(char *str)
else if (critisize == 4) //AAAAHHHHH! (consider sys_error instead) else if (critisize == 4) //AAAAHHHHH! (consider sys_error instead)
Con_Printf("^1AAAAAAAHHHH! An absolute path!\n"); Con_Printf("^1AAAAAAAHHHH! An absolute path!\n");
} }
*/
} }
/* /*

10
engine/server/svq3_game.c
View file

@ -744,6 +744,9 @@ int EXPORT_FN Q3G_SystemCalls(int arg, ...)
void SVQ3_ShutdownGame(void) void SVQ3_ShutdownGame(void)
{ {
int i; int i;
if (!q3gamevm)
return;
for (i = 0; i < MAX_CONFIGSTRINGS; i++) for (i = 0; i < MAX_CONFIGSTRINGS; i++)
{ {
if (svq3_configstrings[i]) if (svq3_configstrings[i])
@ -757,11 +760,18 @@ void SVQ3_ShutdownGame(void)
q3_sentities = NULL; q3_sentities = NULL;
BZ_Free(q3_snapshot_entities); BZ_Free(q3_snapshot_entities);
q3_snapshot_entities = NULL; q3_snapshot_entities = NULL;
VM_Destroy(q3gamevm);
q3gamevm = NULL;
} }
qboolean SVQ3_InitGame(void) qboolean SVQ3_InitGame(void)
{ {
int i; int i;
if (sv.worldmodel->fromgame == fg_quake)
return false; //always fail on q1bsp
//clear out the configstrings //clear out the configstrings
for (i = 0; i < MAX_CONFIGSTRINGS; i++) for (i = 0; i < MAX_CONFIGSTRINGS; i++)
{ {