nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-01-31 20:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated to support mvdsv's qvm api version 13 instead.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3255 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-07-11 18:22:02 +00:00
parent 03aa7fefaf
commit f7b9395261
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
engine/server/pr_q1qvm.c
View file

@ -23,12 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifdef VM_Q1 #ifdef VM_Q1
#define GAME_API_VERSION 12 #define GAME_API_VERSION 13
#define MAX_Q1QVM_EDICTS 768 //according to ktx at api version 12 (fte's protocols go to 2048) #define MAX_Q1QVM_EDICTS 768 //according to ktx at api version 12 (fte's protocols go to 2048)
#define VMFSID_Q1QVM 57235 //a cookie #define VMFSID_Q1QVM 57235 //a cookie
#define WASTED_EDICT_T_SIZE 112 //qclib has split edict_t and entvars_t. #define WASTED_EDICT_T_SIZE sizeof(void*) //qclib has split edict_t and entvars_t.
//mvdsv and the api we're implementing has them in one lump //mvdsv and the api we're implementing has them in one lump
//so we need to bias our entvars_t and fake the offsets a little. //so we need to bias our entvars_t and fake the offsets a little.
@ -139,7 +139,7 @@ typedef enum
G_PRECACHE_VWEP_MODEL, G_PRECACHE_VWEP_MODEL,
G_SETPAUSE, G_SETPAUSE,
G_SETUSERINFO, G_SETUSERINFO,
G_MOVETOGOAL, G_MOVETOGOAL,
@ -982,7 +982,10 @@ static int syscallqvm (void *offset, unsigned int mask, int fn, const int *arg)
if (VM_OOB(arg[1], arg[2])) if (VM_OOB(arg[1], arg[2]))
return -1; return -1;
cv = Cvar_Get(VM_POINTER(arg[0]), "", 0, "QC variables"); cv = Cvar_Get(VM_POINTER(arg[0]), "", 0, "QC variables");
Q_strncpyz(VM_POINTER(arg[1]), cv->string, VM_LONG(arg[2])); if (cv)
Q_strncpyz(VM_POINTER(arg[1]), cv->string, VM_LONG(arg[2]));
else
Q_strncpyz(VM_POINTER(arg[1]), "", VM_LONG(arg[2]));
} }
break; break;
@ -1113,10 +1116,10 @@ Con_DPrintf("PF_readcmd: %s\n%s", s, output);
if (*key == '*' && (VM_LONG(arg[3])&1)) if (*key == '*' && (VM_LONG(arg[3])&1))
return -1; //denied! return -1; //denied!
} }
//fallthrough //fallthrough
case G_MOVETOGOAL: case G_MOVETOGOAL:
return !!WrapQCBuiltin(SV_MoveToGoal, offset, mask, arg, "f"); return !!WrapQCBuiltin(SV_MoveToGoal, offset, mask, arg, "f");
case G_SetBotUserInfo: case G_SetBotUserInfo:
WrapQCBuiltin(PF_ForceInfoKey, offset, mask, arg, "ess"); WrapQCBuiltin(PF_ForceInfoKey, offset, mask, arg, "ess");
@ -1427,14 +1430,10 @@ qboolean Q1QVM_ClientSay(edict_t *player, qboolean team)
if (!q1qvm) if (!q1qvm)
return false; return false;
SV_EndRedirect();
pr_global_struct->time = sv.physicstime; pr_global_struct->time = sv.physicstime;
pr_global_struct->self = Q1QVMPF_EdictToProgs(svprogfuncs, player); pr_global_struct->self = Q1QVMPF_EdictToProgs(svprogfuncs, player);
washandled = VM_Call(q1qvm, GAME_CLIENT_SAY, team); washandled = VM_Call(q1qvm, GAME_CLIENT_SAY, team);
SV_BeginRedirect(RD_CLIENT, host_client->language); //put it back to how we expect it was. *shudder*
return washandled; return washandled;
} }