// Menu
char *vm_m_extensions =
-"DP_CINEMATIC_DPV";
+"DP_CINEMATIC_DPV "
+"DP_QC_ASINACOSATANATAN2TAN "
+"DP_QC_STRINGCOLORFUNCTIONS";
/*
=========
VM_CheckEmptyString (s);
if(snd_initialized.integer && !S_PrecacheSound (s,true, true))
- Con_Printf("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+ {
+ VM_Warning("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+ return;
+ }
}
/*
in_client_mouse = true;
break;
default:
- PRVM_ERROR("VM_M_setmousetarget: wrong destination %i !\n",PRVM_G_FLOAT(OFS_PARM0));
+ PRVM_ERROR("VM_M_setmousetarget: wrong destination %f !",PRVM_G_FLOAT(OFS_PARM0));
}
}
// key_dest = key_message
// break;
default:
- PRVM_ERROR("VM_M_setkeydest: wrong destination %i !\n",prog->globals.generic[OFS_PARM0]);
+ PRVM_ERROR("VM_M_setkeydest: wrong destination %f !", PRVM_G_FLOAT(OFS_PARM0));
}
}
const char *s;
if(prog->argc == 0)
- PRVM_ERROR("VM_M_callfunction: 1 parameter is required !\n");
+ PRVM_ERROR("VM_M_callfunction: 1 parameter is required !");
s = PRVM_G_STRING(OFS_PARM0 + (prog->argc - 1));
if(!s)
- PRVM_ERROR("VM_M_callfunction: null string !\n");
+ PRVM_ERROR("VM_M_callfunction: null string !");
VM_CheckEmptyString(s);
func = PRVM_ED_FindFunction(s);
if(!func)
- PRVM_ERROR("VM_M_callfunciton: function %s not found !\n", s);
+ PRVM_ERROR("VM_M_callfunciton: function %s not found !", s);
else if (func->first_statement < 0)
{
// negative statements are built in functions
s = PRVM_G_STRING(OFS_PARM0);
if(!s)
- PRVM_ERROR("VM_M_isfunction: null string !\n");
+ PRVM_ERROR("VM_M_isfunction: null string !");
VM_CheckEmptyString(s);
VM_SAFEPARMCOUNT(2, VM_M_writetofile);
- file = VM_GetFileHandle( PRVM_G_FLOAT(OFS_PARM0) );
- if( !file ) {
+ file = VM_GetFileHandle( (int)PRVM_G_FLOAT(OFS_PARM0) );
+ if( !file )
+ {
+ VM_Warning("VM_M_writetofile: invalid or closed file handle\n");
return;
}
-
+
ent = PRVM_G_EDICT(OFS_PARM1);
if(ent->priv.required->free)
{
- Con_Printf("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1));
+ VM_Warning("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1));
return;
}
int nr;
VM_SAFEPARMCOUNT(1, VM_getresolution);
- nr = PRVM_G_FLOAT(OFS_PARM0);
+ nr = (int)PRVM_G_FLOAT(OFS_PARM0);
PRVM_G_VECTOR(OFS_RETURN)[0] = video_resolutions[nr][0];
PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
}
-/*
-=========
-VM_M_keynumtostring
-
-string keynumtostring(float keynum)
-=========
-*/
-void VM_M_keynumtostring(void)
-{
- int keynum;
- char *tmp;
- VM_SAFEPARMCOUNT(1, VM_M_keynumtostring);
-
- keynum = PRVM_G_FLOAT(OFS_PARM0);
-
- tmp = VM_GetTempString();
-
- strcpy(tmp, Key_KeynumToString(keynum));
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
-}
-
-/*
-=========
-VM_M_stringtokeynum
-
-float stringtokeynum(string key)
-=========
-*/
-void VM_M_stringtokeynum( void )
-{
- const char *str;
- VM_SAFEPARMCOUNT( 1, VM_M_keynumtostring );
-
- str = PRVM_G_STRING( OFS_PARM0 );
-
- PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str );
-}
-
/*
=========
VM_M_findkeysforcommand
M_FindKeysForCommand(cmd, keys);
for(i = 0; i < NUMKEYS; i++)
- ret = strcat(ret, va(" \'%i\'", keys[i]));
+ strlcat(ret, va(" \'%i\'", keys[i]), VM_STRINGTEMP_LENGTH);
PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(ret);
}
PRVM_G_FLOAT( OFS_RETURN ) = 0;
- type = PRVM_G_FLOAT( OFS_PARM0 );
+ type = (int)PRVM_G_FLOAT( OFS_PARM0 );
switch(type)
{
case 0:
PRVM_G_FLOAT ( OFS_RETURN ) = serverlist_sortdescending;
return;
default:
- Con_Printf( "VM_M_getserverliststat: bad type %i!\n", type );
+ VM_Warning( "VM_M_getserverliststat: bad type %i!\n", type );
}
}
if( !str )
PRVM_ERROR( "VM_M_setserverlistmaskstring: null string passed!" );
- masknr = PRVM_G_FLOAT( OFS_PARM0 );
+ masknr = (int)PRVM_G_FLOAT( OFS_PARM0 );
if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
mask = &serverlist_andmasks[masknr];
else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
mask = &serverlist_ormasks[masknr - 512 ];
- else {
- Con_Printf( "VM_M_setserverlistmaskstring: invalid mask number %i\n", masknr );
+ else
+ {
+ VM_Warning( "VM_M_setserverlistmaskstring: invalid mask number %i\n", masknr );
return;
}
switch( field ) {
case SLIF_CNAME:
- strncpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) );
+ strlcpy( mask->info.cname, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.cname) );
break;
case SLIF_NAME:
- strncpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name) );
+ strlcpy( mask->info.name, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.name) );
break;
case SLIF_MAP:
- strncpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map) );
+ strlcpy( mask->info.map, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.map) );
break;
case SLIF_MOD:
- strncpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod) );
+ strlcpy( mask->info.mod, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.mod) );
break;
case SLIF_GAME:
- strncpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game) );
+ strlcpy( mask->info.game, PRVM_G_STRING( OFS_PARM2 ), sizeof(mask->info.game) );
break;
default:
- Con_Printf( "VM_M_setserverlistmaskstring: Bad field number %i passed!\n", field );
+ VM_Warning( "VM_M_setserverlistmaskstring: Bad field number %i passed!\n", field );
return;
}
mask->active = true;
- mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+ mask->tests[field] = (serverlist_maskop_t)((int)PRVM_G_FLOAT( OFS_PARM3 ));
}
/*
int field;
VM_SAFEPARMCOUNT( 4, VM_M_setserverlistmasknumber );
- masknr = PRVM_G_FLOAT( OFS_PARM0 );
+ masknr = (int)PRVM_G_FLOAT( OFS_PARM0 );
if( masknr >= 0 && masknr <= SERVERLIST_ANDMASKCOUNT )
mask = &serverlist_andmasks[masknr];
else if( masknr >= 512 && masknr - 512 <= SERVERLIST_ORMASKCOUNT )
mask = &serverlist_ormasks[masknr - 512 ];
- else {
- Con_Printf( "VM_M_setserverlistmasknumber: invalid mask number %i\n", masknr );
+ else
+ {
+ VM_Warning( "VM_M_setserverlistmasknumber: invalid mask number %i\n", masknr );
return;
}
- number = PRVM_G_FLOAT( OFS_PARM2 );
+ number = (int)PRVM_G_FLOAT( OFS_PARM2 );
field = (int) PRVM_G_FLOAT( OFS_PARM1 );
switch( field ) {
mask->info.protocol = number;
break;
default:
- Con_Printf( "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
+ VM_Warning( "VM_M_setserverlistmasknumber: Bad field number %i passed!\n", field );
return;
}
mask->active = true;
- mask->tests[field] = (int) PRVM_G_FLOAT( OFS_PARM3 );
+ mask->tests[field] = (serverlist_maskop_t)((int)PRVM_G_FLOAT( OFS_PARM3 ));
}
PRVM_G_INT(OFS_RETURN) = 0;
- hostnr = PRVM_G_FLOAT(OFS_PARM1);
+ hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
if(hostnr < 0 || hostnr >= serverlist_viewcount)
{
PRVM_G_INT(OFS_RETURN) = 0;
- hostnr = PRVM_G_FLOAT(OFS_PARM1);
+ hostnr = (int)PRVM_G_FLOAT(OFS_PARM1);
if(hostnr < 0 || hostnr >= serverlist_viewcount)
{
{
VM_SAFEPARMCOUNT( 2, VM_M_setserverlistsort );
- serverlist_sortbyfield = (int) PRVM_G_FLOAT( OFS_PARM0 );
+ serverlist_sortbyfield = (serverlist_infofield_t)((int)PRVM_G_FLOAT( OFS_PARM0 ));
serverlist_sortdescending = (qboolean) PRVM_G_FLOAT( OFS_PARM1 );
}
void VM_M_refreshserverlist( void )
{
VM_SAFEPARMCOUNT( 0, VM_M_refreshserverlist );
- ServerList_QueryList();
+ ServerList_QueryList(true, false);
}
/*
int destclient;
if(!sv.active)
- PRVM_ERROR("VM_WriteDest: game is not server (%s)\n", PRVM_NAME);
+ PRVM_ERROR("VM_WriteDest: game is not server (%s)", PRVM_NAME);
- dest = PRVM_G_FLOAT(OFS_PARM1);
+ dest = (int)PRVM_G_FLOAT(OFS_PARM1);
switch (dest)
{
case MSG_BROADCAST:
case MSG_ONE:
destclient = (int) PRVM_G_FLOAT(OFS_PARM2);
- if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active)
- PRVM_ERROR("VM_clientcommand: %s: invalid client !\n", PRVM_NAME);
+ if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active || !svs.clients[destclient].netconnection)
+ PRVM_ERROR("VM_clientcommand: %s: invalid client !", PRVM_NAME);
- return &svs.clients[destclient].message;
+ return &svs.clients[destclient].netconnection->message;
case MSG_ALL:
return &sv.reliable_datagram;
void VM_M_WriteByte (void)
{
- MSG_WriteByte (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteByte (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
}
void VM_M_WriteChar (void)
{
- MSG_WriteChar (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteChar (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
}
void VM_M_WriteShort (void)
{
- MSG_WriteShort (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteShort (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
}
void VM_M_WriteLong (void)
{
- MSG_WriteLong (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0));
+ MSG_WriteLong (VM_WriteDest(), (int)PRVM_G_FLOAT(OFS_PARM0));
}
void VM_M_WriteAngle (void)
MSG_WriteShort (VM_WriteDest(), PRVM_G_EDICTNUM(OFS_PARM0));
}
+//string(void) getextresponse = #624; // returns the next extResponse packet that was sent to this client
+void VM_M_getextresponse (void)
+{
+ VM_SAFEPARMCOUNT(0,VM_argv);
+
+ if (net_extresponse_count <= 0)
+ {
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(NULL);
+ }
+ else
+ {
+ int first;
+ --net_extresponse_count;
+ first = (net_extresponse_last + NET_EXTRESPONSE_MAX - net_extresponse_count) % NET_EXTRESPONSE_MAX;
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(net_extresponse[first]);
+ }
+}
+
prvm_builtin_t vm_m_builtins[] = {
0, // to be consistent with the old vm
// common builtings (mostly)
VM_search_getfilename, // 77
VM_chr,
VM_itof,
- VM_ftoi, // 80
+ VM_ftoe, // 80
VM_itof, // isString
VM_altstr_count,
VM_altstr_prepare,
VM_cin_setstate,
VM_cin_getstate,
VM_cin_restart, // 465
- 0,0,0,0,0, // 470
- e10, // 480
+ VM_drawline, // 466
+ 0,0,0,0, // 470
+ VM_asin, // #471 float(float s) VM_asin (DP_QC_ASINACOSATANATAN2TAN)
+ VM_acos, // #472 float(float c) VM_acos (DP_QC_ASINACOSATANATAN2TAN)
+ VM_atan, // #473 float(float t) VM_atan (DP_QC_ASINACOSATANATAN2TAN)
+ VM_atan2, // #474 float(float c, float s) VM_atan2 (DP_QC_ASINACOSATANATAN2TAN)
+ VM_tan, // #475 float(float a) VM_tan (DP_QC_ASINACOSATANATAN2TAN)
+ VM_strlennocol, // #476 float(string s) : DRESK - String Length (not counting color codes) (DP_QC_STRINGCOLORFUNCTIONS)
+ VM_strdecolorize, // #477 string(string s) : DRESK - Decolorized String (DP_QC_STRINGCOLORFUNCTIONS)
+ 0,0,0, // 480
e10, // 490
e10, // 500
e100, // 600
VM_M_writetofile,
VM_M_isfunction,
VM_M_getresolution,
- VM_M_keynumtostring,
+ VM_keynumtostring,
VM_M_findkeysforcommand,// 610
VM_M_getserverliststat,
VM_M_getserverliststring,
VM_parseentitydata,
- VM_M_stringtokeynum,
+ VM_stringtokeynum,
VM_M_resetserverlistmasks,
VM_M_setserverlistmaskstring,
VM_M_setserverlistmasknumber,
VM_M_refreshserverlist,
VM_M_getserverlistnumber,
VM_M_getserverlistindexforkey,
- VM_M_addwantedserverlistkey // 623
+ VM_M_addwantedserverlistkey, // 623
+ VM_M_getextresponse
};
const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);
projects / xonotic / darkplaces.git / blobdiff