X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_cmds.c;h=f5c13fdee93370e03ca9347aea9ad2d5db411c17;hb=c8faaabd182ae985281ec019f87ce7b7186b4ce9;hp=55a7584edcca90fe4e367452140eb9e342de47ab;hpb=b96a22554e71b618bfc62d2f30cc0392cb34305c;p=xonotic%2Fdarkplaces.git diff --git a/prvm_cmds.c b/prvm_cmds.c index 55a7584e..f5c13fde 100644 --- a/prvm_cmds.c +++ b/prvm_cmds.c @@ -11,8 +11,6 @@ // temp string handling // LordHavoc: added this to semi-fix the problem of using many ftos calls in a print -#define VM_STRINGTEMP_BUFFERS 16 -#define VM_STRINGTEMP_LENGTH 4096 static char vm_string_temp[VM_STRINGTEMP_BUFFERS][VM_STRINGTEMP_LENGTH]; static int vm_string_tempindex = 0; @@ -78,7 +76,7 @@ static qboolean checkextension(const char *name) { int len; char *e, *start; - len = strlen(name); + len = (int)strlen(name); for (e = prog->extensionstring;*e;e++) { @@ -89,11 +87,8 @@ static qboolean checkextension(const char *name) start = e; while (*e && *e != ' ') e++; - if (e - start == len) - if (!strncasecmp(start, name, len)) - { - return true; - } + if ((e - start) == len && !strncasecmp(start, name, len)) + return true; } return false; } @@ -121,14 +116,14 @@ void VM_error (void) char string[VM_STRINGTEMP_LENGTH]; VM_VarString(0, string, sizeof(string)); - Con_Printf("======%S ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); + Con_Printf("======%s ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); if(prog->self) { ed = PRVM_G_EDICT(prog->self->ofs); PRVM_ED_Print(ed); } - PRVM_ERROR ("%s: Program error", PRVM_NAME); + PRVM_ERROR ("%s: Program error in function %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); } /* @@ -147,7 +142,7 @@ void VM_objerror (void) char string[VM_STRINGTEMP_LENGTH]; VM_VarString(0, string, sizeof(string)); - Con_Printf("======%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); + Con_Printf("======OBJECT ERROR======\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); if(prog->self) { ed = PRVM_G_EDICT (prog->self->ofs); @@ -157,7 +152,8 @@ void VM_objerror (void) } else // objerror has to display the object fields -> else call - PRVM_ERROR ("VM_objecterror: self not defined !\n"); + PRVM_ERROR ("VM_objecterror: self not defined !"); + Con_Printf("%s OBJECT ERROR in %s:\n%s\n", PRVM_NAME, PRVM_GetString(prog->xfunction->s_name), string); } /* @@ -224,9 +220,12 @@ void VM_sprint (void) } client = svs.clients + clientnum; + if (!client->netconnection) + return; + VM_VarString(1, string, sizeof(string)); - MSG_WriteChar(&client->message,svc_print); - MSG_WriteString(&client->message, string); + MSG_WriteChar(&client->netconnection->message,svc_print); + MSG_WriteString(&client->netconnection->message, string); } /* @@ -257,24 +256,20 @@ void VM_normalize (void) { float *value1; vec3_t newvalue; - float new; + double f; VM_SAFEPARMCOUNT(1,VM_normalize); value1 = PRVM_G_VECTOR(OFS_PARM0); - new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2]; - new = sqrt(new); - - if (new == 0) - newvalue[0] = newvalue[1] = newvalue[2] = 0; - else + f = VectorLength2(value1); + if (f) { - new = 1/new; - newvalue[0] = value1[0] * new; - newvalue[1] = value1[1] * new; - newvalue[2] = value1[2] * new; + f = 1.0 / sqrt(f); + VectorScale(value1, f, newvalue); } + else + VectorClear(newvalue); VectorCopy (newvalue, PRVM_G_VECTOR(OFS_RETURN)); } @@ -288,17 +283,8 @@ scalar vlen(vector) */ void VM_vlen (void) { - float *value1; - float new; - VM_SAFEPARMCOUNT(1,VM_vlen); - - value1 = PRVM_G_VECTOR(OFS_PARM0); - - new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2]; - new = sqrt(new); - - PRVM_G_FLOAT(OFS_RETURN) = new; + PRVM_G_FLOAT(OFS_RETURN) = VectorLength(PRVM_G_VECTOR(OFS_PARM0)); } /* @@ -370,7 +356,7 @@ void VM_vectoangles (void) yaw = 270; forward = sqrt(value1[0]*value1[0] + value1[1]*value1[1]); - pitch = (int) (atan2(value1[2], forward) * 180 / M_PI); + pitch = (atan2(value1[2], forward) * 180 / M_PI); if (pitch < 0) pitch += 360; } @@ -416,15 +402,15 @@ void PF_sound (void) { char *sample; int channel; - edict_t *entity; + prvm_edict_t *entity; int volume; float attenuation; - entity = G_EDICT(OFS_PARM0); - channel = G_FLOAT(OFS_PARM1); - sample = G_STRING(OFS_PARM2); - volume = G_FLOAT(OFS_PARM3) * 255; - attenuation = G_FLOAT(OFS_PARM4); + entity = PRVM_G_EDICT(OFS_PARM0); + channel = PRVM_G_FLOAT(OFS_PARM1); + sample = PRVM_G_STRING(OFS_PARM2); + volume = PRVM_G_FLOAT(OFS_PARM3) * 255; + attenuation = PRVM_G_FLOAT(OFS_PARM4); if (volume < 0 || volume > 255) Host_Error ("SV_StartSound: volume = %i", volume); @@ -484,15 +470,15 @@ VM_localcmd Sends text over to the client's execution buffer -[localcmd (string) or] -cmd (string) +[localcmd (string, ...) or] +cmd (string, ...) ================= */ void VM_localcmd (void) { - VM_SAFEPARMCOUNT(1,VM_localcmd); - - Cbuf_AddText(PRVM_G_STRING(OFS_PARM0)); + char string[VM_STRINGTEMP_LENGTH]; + VM_VarString(0, string, sizeof(string)); + Cbuf_AddText(string); } /* @@ -526,7 +512,7 @@ void VM_cvar_string(void) name = PRVM_G_STRING(OFS_PARM0); if(!name) - PRVM_ERROR("VM_str_cvar: %s: null string\n", PRVM_NAME); + PRVM_ERROR("VM_cvar_string: %s: null string", PRVM_NAME); VM_CheckEmptyString(name); @@ -539,6 +525,36 @@ void VM_cvar_string(void) PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(out); } + +/* +======================== +VM_cvar_defstring + +const string VM_cvar_defstring (string) +======================== +*/ +void VM_cvar_defstring (void) +{ + char *out; + const char *name; + const char *cvar_string; + VM_SAFEPARMCOUNT(1,VM_cvar_string); + + name = PRVM_G_STRING(OFS_PARM0); + + if(!name) + PRVM_ERROR("VM_cvar_defstring: %s: null string", PRVM_NAME); + + VM_CheckEmptyString(name); + + out = VM_GetTempString(); + + cvar_string = Cvar_VariableDefString(name); + + strcpy(out, cvar_string); + + PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(out); +} /* ================= VM_cvar_set @@ -566,7 +582,11 @@ void VM_dprint (void) if (developer.integer) { VM_VarString(0, string, sizeof(string)); +#if 1 + Con_Printf("%s", string); +#else Con_Printf("%s: %s", PRVM_NAME, string); +#endif } } @@ -692,7 +712,7 @@ void VM_ftoi(void) ent = PRVM_G_FLOAT(OFS_PARM0); if(PRVM_PROG_TO_EDICT(ent)->priv.required->free) - PRVM_ERROR ("VM_ftoe: %s tried to access a freed entity (entity %i)!\n", PRVM_NAME, ent); + PRVM_ERROR ("VM_ftoe: %s tried to access a freed entity (entity %i)!", PRVM_NAME, ent); PRVM_G_INT(OFS_RETURN) = ent; } @@ -729,11 +749,17 @@ void VM_remove (void) VM_SAFEPARMCOUNT(1, VM_remove); ed = PRVM_G_EDICT(OFS_PARM0); + if( PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts ) { + Con_DPrint( "VM_remove: tried to remove the null entity or a reserved entity!\n" ); + } else if( ed->priv.required->free ) { + Con_DPrint( "VM_remove: tried to remove an already freed entity!\n" ); + } else { + PRVM_ED_Free (ed); + } // if (ed == prog->edicts) -// PRVM_ERROR ("remove: tried to remove world\n"); +// PRVM_ERROR ("remove: tried to remove world"); // if (PRVM_NUM_FOR_EDICT(ed) <= sv.maxclients) -// Host_Error("remove: tried to remove a client\n"); - PRVM_ED_Free (ed); +// Host_Error("remove: tried to remove a client"); } /* @@ -828,7 +854,6 @@ VM_findchain entity findchain(.string field, string match) ========= */ -int PRVM_ED_FindFieldOffset(const char *field); // chained search for strings in entity fields // entity(.string field, string match) findchain = #402; void VM_findchain (void) @@ -843,9 +868,9 @@ void VM_findchain (void) // is the same like !(prog->flag & PRVM_FE_CHAIN) - even if the operator precedence is another if(!prog->flag & PRVM_FE_CHAIN) - PRVM_ERROR("VM_findchain: %s doesnt have a chain field !\n", PRVM_NAME); + PRVM_ERROR("VM_findchain: %s doesnt have a chain field !", PRVM_NAME); - chain_of = PRVM_ED_FindFieldOffset ("chain"); + chain_of = PRVM_ED_FindField("chain")->ofs; chain = prog->edicts; @@ -897,9 +922,9 @@ void VM_findchainfloat (void) VM_SAFEPARMCOUNT(2, VM_findchainfloat); if(!prog->flag & PRVM_FE_CHAIN) - PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !\n", PRVM_NAME); + PRVM_ERROR("VM_findchainfloat: %s doesnt have a chain field !", PRVM_NAME); - chain_of = PRVM_ED_FindFieldOffset ("chain"); + chain_of = PRVM_ED_FindField("chain")->ofs; chain = (prvm_edict_t *)prog->edicts; @@ -923,51 +948,85 @@ void VM_findchainfloat (void) } /* -========= -VM_precache_file +======================== +VM_findflags -string precache_file(string) -========= +entity findflags(entity start, .float field, float match) +======================== */ -void VM_precache_file (void) -{ // precache_file is only used to copy files with qcc, it does nothing - VM_SAFEPARMCOUNT(1,VM_precache_file); +// LordHavoc: search for flags in float fields +void VM_findflags (void) +{ + int e; + int f; + int s; + prvm_edict_t *ed; - PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0); -} + VM_SAFEPARMCOUNT(3, VM_findflags); -/* -========= -VM_preache_error -used instead of the other VM_precache_* functions in the builtin list -========= -*/ + e = PRVM_G_EDICTNUM(OFS_PARM0); + f = PRVM_G_INT(OFS_PARM1); + s = (int)PRVM_G_FLOAT(OFS_PARM2); -void VM_precache_error (void) -{ - PRVM_ERROR ("PF_Precache_*: Precache can only be done in spawn functions"); + for (e++ ; e < prog->num_edicts ; e++) + { + prog->xfunction->builtinsprofile++; + ed = PRVM_EDICT_NUM(e); + if (ed->priv.required->free) + continue; + if ((int)PRVM_E_FLOAT(ed,f) & s) + { + VM_RETURN_EDICT(ed); + return; + } + } + + VM_RETURN_EDICT(prog->edicts); } /* -========= -VM_precache_sound +======================== +VM_findchainflags -string precache_sound (string sample) -========= +entity findchainflags(.float field, float match) +======================== */ -void VM_precache_sound (void) +// LordHavoc: chained search for flags in float fields +void VM_findchainflags (void) { - const char *s; + int i; + int f; + int s; + int chain_of; + prvm_edict_t *ent, *chain; - VM_SAFEPARMCOUNT(1, VM_precache_sound); + VM_SAFEPARMCOUNT(2, VM_findchainflags); - s = PRVM_G_STRING(OFS_PARM0); - PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0); - VM_CheckEmptyString (s); + if(!prog->flag & PRVM_FE_CHAIN) + PRVM_ERROR("VM_findchainflags: %s doesnt have a chain field !", PRVM_NAME); + + chain_of = PRVM_ED_FindField("chain")->ofs; + + chain = (prvm_edict_t *)prog->edicts; + + f = PRVM_G_INT(OFS_PARM0); + s = (int)PRVM_G_FLOAT(OFS_PARM1); + + ent = PRVM_NEXT_EDICT(prog->edicts); + for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) + { + prog->xfunction->builtinsprofile++; + if (ent->priv.required->free) + continue; + if (!((int)PRVM_E_FLOAT(ent,f) & s)) + continue; + + PRVM_E_INT(ent,chain_of) = PRVM_EDICT_TO_PROG(chain); + chain = ent; + } - 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_RETURN_EDICT(chain); } /* @@ -1013,7 +1072,7 @@ void VM_crash(void) { VM_SAFEPARMCOUNT(0, VM_crash); - PRVM_ERROR("Crash called by %s\n",PRVM_NAME); + PRVM_ERROR("Crash called by %s",PRVM_NAME); } /* @@ -1138,98 +1197,6 @@ void VM_nextent (void) } } -/* -=============================================================================== -MESSAGE WRITING - -used only for client and menu -severs uses VM_SV_... - -Write*(* data, float type, float to) - -=============================================================================== -*/ - -#define MSG_BROADCAST 0 // unreliable to all -#define MSG_ONE 1 // reliable to one (msg_entity) -#define MSG_ALL 2 // reliable to all -#define MSG_INIT 3 // write to the init string - -sizebuf_t *VM_WriteDest (void) -{ - int dest; - int destclient; - - if(!sv.active) - PRVM_ERROR("VM_WriteDest: game is not server (%s)\n", PRVM_NAME); - - dest = G_FLOAT(OFS_PARM1); - switch (dest) - { - case MSG_BROADCAST: - return &sv.datagram; - - 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); - - return &svs.clients[destclient].message; - - case MSG_ALL: - return &sv.reliable_datagram; - - case MSG_INIT: - return &sv.signon; - - default: - PRVM_ERROR ("WriteDest: bad destination"); - break; - } - - return NULL; -} - -void VM_WriteByte (void) -{ - MSG_WriteByte (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); -} - -void VM_WriteChar (void) -{ - MSG_WriteChar (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); -} - -void VM_WriteShort (void) -{ - MSG_WriteShort (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); -} - -void VM_WriteLong (void) -{ - MSG_WriteLong (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); -} - -void VM_WriteAngle (void) -{ - MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol); -} - -void VM_WriteCoord (void) -{ - MSG_WriteCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol); -} - -void VM_WriteString (void) -{ - MSG_WriteString (VM_WriteDest(), PRVM_G_STRING(OFS_PARM0)); -} - -void VM_WriteEntity (void) -{ - MSG_WriteShort (VM_WriteDest(), PRVM_G_EDICTNUM(OFS_PARM0)); -} - //============================================================================= /* @@ -1399,7 +1366,7 @@ void VM_min (void) PRVM_G_FLOAT(OFS_RETURN) = f; } else - PRVM_ERROR("VM_min: %s must supply at least 2 floats\n", PRVM_NAME); + PRVM_ERROR("VM_min: %s must supply at least 2 floats", PRVM_NAME); } /* @@ -1426,7 +1393,7 @@ void VM_max (void) PRVM_G_FLOAT(OFS_RETURN) = f; } else - PRVM_ERROR("VM_max: %s must supply at least 2 floats\n", PRVM_NAME); + PRVM_ERROR("VM_max: %s must supply at least 2 floats", PRVM_NAME); } /* @@ -1490,10 +1457,10 @@ setcolor(clientent, value) { client_t *client; int entnum, i; - eval_t *val; + prvm_eval_t *val; - entnum = G_EDICTNUM(OFS_PARM0); - i = G_FLOAT(OFS_PARM1); + entnum = PRVM_G_EDICTNUM(OFS_PARM0); + i = PRVM_G_FLOAT(OFS_PARM1); if (entnum < 1 || entnum > svs.maxclients || !svs.clients[entnum-1].active) { @@ -1502,11 +1469,11 @@ setcolor(clientent, value) } client = svs.clients + entnum-1; - if ((val = GETEDICTFIELDVALUE(client->edict, eval_clientcolors))) + if ((val = PRVM_GETEDICTFIELDVALUE(client->edict, eval_clientcolors))) val->_float = i; client->colors = i; client->old_colors = i; - client->edict->v->team = (i & 15) + 1; + client->edict->fields.server->team = (i & 15) + 1; MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); MSG_WriteByte (&sv.reliable_datagram, entnum - 1); @@ -1584,29 +1551,28 @@ void VM_fopen(void) modestring = "wb"; break; default: - Con_Printf("VM_fopen: %s no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode); + Con_Printf("VM_fopen: %s: no such mode %i (valid: 0 = read, 1 = append, 2 = write)\n", PRVM_NAME, mode); PRVM_G_FLOAT(OFS_RETURN) = -3; return; } filename = PRVM_G_STRING(OFS_PARM0); - // .. is parent directory on many platforms - // / is parent directory on Amiga - // : is root of drive on Amiga (also used as a directory separator on Mac, but / works there too, so that's a bad idea) - // \ is a windows-ism (so it's naughty to use it, / works on all platforms) - if ((filename[0] == '.' && filename[1] == '.') || filename[0] == '/' || strrchr(filename, ':') || strrchr(filename, '\\')) - { - Con_Printf("VM_fopen: %s dangerous or non-portable filename \"%s\" not allowed. (contains : or \\ or begins with .. or /)\n", PRVM_NAME, filename); - PRVM_G_FLOAT(OFS_RETURN) = -4; - return; - } + VM_FILES[filenum] = FS_Open(va("data/%s", filename), modestring, false, false); if (VM_FILES[filenum] == NULL && mode == 0) VM_FILES[filenum] = FS_Open(va("%s", filename), modestring, false, false); if (VM_FILES[filenum] == NULL) + { + if (developer.integer >= 10) + Con_Printf("VM_fopen: %s: %s mode %s failed\n", PRVM_NAME, filename, modestring); PRVM_G_FLOAT(OFS_RETURN) = -1; + } else + { + if (developer.integer >= 10) + Con_Printf("VM_fopen: %s: %s mode %s opened as #%i\n", PRVM_NAME, filename, modestring, filenum); PRVM_G_FLOAT(OFS_RETURN) = filenum; + } } /* @@ -1634,6 +1600,8 @@ void VM_fclose(void) Con_Printf("VM_fclose: no such file handle %i (or file has been closed) in %s\n", filenum, PRVM_NAME); return; } + if (developer.integer >= 10) + Con_Printf("VM_fclose: %s: #%i closed\n", PRVM_NAME, filenum); FS_Close(VM_FILES[filenum]); VM_FILES[filenum] = NULL; } @@ -1682,7 +1650,7 @@ void VM_fgets(void) if (c != '\n') FS_UnGetc(VM_FILES[filenum], (unsigned char)c); } - if (developer.integer >= 3) + if (developer.integer >= 100) Con_Printf("fgets: %s: %s\n", PRVM_NAME, string); if (c >= 0 || end) PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(string); @@ -1718,9 +1686,9 @@ void VM_fputs(void) return; } VM_VarString(1, string, sizeof(string)); - if ((stringlength = strlen(string))) + if ((stringlength = (int)strlen(string))) FS_Write(VM_FILES[filenum], string, stringlength); - if (developer.integer) + if (developer.integer >= 100) Con_Printf("fputs: %s: %s\n", PRVM_NAME, string); } @@ -1760,7 +1728,7 @@ void VM_strcat(void) char *s; if(prog->argc < 1) - PRVM_ERROR("VM_strcat wrong parameter count (min. 1 expected ) !\n"); + PRVM_ERROR("VM_strcat wrong parameter count (min. 1 expected ) !"); s = VM_GetTempString(); VM_VarString(0, s, VM_STRINGTEMP_LENGTH); @@ -1822,18 +1790,17 @@ VM_strzone string strzone(string s) ========= */ -//string(string s) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often) +//string(string s, ...) strzone = #118; // makes a copy of a string into the string zone and returns it, this is often used to keep around a tempstring for longer periods of time (tempstrings are replaced often) void VM_strzone(void) { - const char *in; char *out; + char string[VM_STRINGTEMP_LENGTH]; VM_SAFEPARMCOUNT(1,VM_strzone); - in = PRVM_G_STRING(OFS_PARM0); - out = PRVM_AllocString(strlen(in) + 1); - strcpy(out, in); - PRVM_G_INT(OFS_RETURN) = PRVM_SetQCString(out); + VM_VarString(0, string, sizeof(string)); + PRVM_G_INT(OFS_RETURN) = PRVM_AllocString(strlen(string) + 1, &out); + strcpy(out, string); } /* @@ -1847,7 +1814,7 @@ strunzone(string s) void VM_strunzone(void) { VM_SAFEPARMCOUNT(1,VM_strunzone); - PRVM_FreeString((char *)PRVM_G_STRING(OFS_PARM0)); + PRVM_FreeString(PRVM_G_INT(OFS_PARM0)); } /* @@ -1887,50 +1854,38 @@ VM_tokenize float tokenize(string s) ========= */ -//float(string s) tokenize = #441; -// takes apart a string into individal words (access them with argv), returns how many -// this function originally written by KrimZon, made shorter by LordHavoc -static char **tokens = NULL; -static int max_tokens, num_tokens = 0; +//float(string s) tokenize = #441; // takes apart a string into individal words (access them with argv), returns how many +//this function originally written by KrimZon, made shorter by LordHavoc +//20040203: rewritten by LordHavoc (no longer uses allocations) +int num_tokens = 0; +char *tokens[256], tokenbuf[MAX_INPUTLINE]; void VM_tokenize (void) { - const char *p, *str; + size_t pos; + const char *p; VM_SAFEPARMCOUNT(1,VM_tokenize); - str = PRVM_G_STRING(OFS_PARM0); - - if (tokens != NULL) - { - int i; - for (i=0;i= (int)(sizeof(tokens)/sizeof(tokens[0]))) + break; + if (pos + strlen(com_token) + 1 > sizeof(tokenbuf)) + break; + tokens[num_tokens++] = tokenbuf + pos; + strcpy(tokenbuf + pos, com_token); + pos += strlen(com_token) + 1; } PRVM_G_FLOAT(OFS_RETURN) = num_tokens; } -/* -========= -VM_argv - -string argv(float n) -========= -*/ -//string(float n) argv = #442; -// returns a word from the tokenized string (returns nothing for an invalid index) -// this function originally written by KrimZon, made shorter by LordHavoc +//string(float n) argv = #442; // returns a word from the tokenized string (returns nothing for an invalid index) +//this function originally written by KrimZon, made shorter by LordHavoc void VM_argv (void) { int token_num; @@ -1938,6 +1893,7 @@ void VM_argv (void) VM_SAFEPARMCOUNT(1,VM_argv); token_num = PRVM_G_FLOAT(OFS_PARM0); + if (token_num >= 0 && token_num < num_tokens) PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tokens[token_num]); else @@ -1948,43 +1904,43 @@ void VM_argv (void) //void(entity e, entity tagentity, string tagname) setattachment = #443; // attachs e to a tag on tagentity (note: use "" to attach to entity origin/angles instead of a tag) void PF_setattachment (void) { - edict_t *e = G_EDICT(OFS_PARM0); - edict_t *tagentity = G_EDICT(OFS_PARM1); - char *tagname = G_STRING(OFS_PARM2); - eval_t *v; + prvm_edict_t *e = PRVM_G_EDICT(OFS_PARM0); + prvm_edict_t *tagentity = PRVM_G_EDICT(OFS_PARM1); + char *tagname = PRVM_G_STRING(OFS_PARM2); + prvm_eval_t *v; int i, modelindex; model_t *model; if (tagentity == NULL) - tagentity = sv.edicts; + tagentity = prog->edicts; - v = GETEDICTFIELDVALUE(e, eval_tag_entity); + v = PRVM_GETEDICTFIELDVALUE(e, eval_tag_entity); if (v) - v->edict = EDICT_TO_PROG(tagentity); + fields.server->edict = PRVM_EDICT_TO_PROG(tagentity); - v = GETEDICTFIELDVALUE(e, eval_tag_index); + v = PRVM_GETEDICTFIELDVALUE(e, eval_tag_index); if (v) - v->_float = 0; - if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0]) + fields.server->_float = 0; + if (tagentity != NULL && tagentity != prog->edicts && tagname && tagname[0]) { - modelindex = (int)tagentity->v->modelindex; + modelindex = (int)tagentity->fields.server->modelindex; if (modelindex >= 0 && modelindex < MAX_MODELS) { model = sv.models[modelindex]; - if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames) - for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++) - if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name)) - v->_float = i + 1; + if (model->data_overridetagnamesforskin && (unsigned int)tagentity->fields.server->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->fields.server->skin].num_overridetagnames) + for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->fields.server->skin].num_overridetagnames;i++) + if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->fields.server->skin].data_overridetagnames[i].name)) + fields.server->_float = i + 1; // FIXME: use a model function to get tag info (need to handle skeletal) - if (v->_float == 0 && model->num_tags) + if (fields.server->_float == 0 && model->num_tags) for (i = 0;i < model->num_tags;i++) if (!strcmp(tagname, model->data_tags[i].name)) - v->_float = i + 1; - if (v->_float == 0) - Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity), model->name); + fields.server->_float = i + 1; + if (fields.server->_float == 0) + Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i (model \"%s\") but could not find it\n", PRVM_NUM_FOR_EDICT(e), PRVM_NUM_FOR_EDICT(tagentity), tagname, tagname, PRVM_NUM_FOR_EDICT(tagentity), model->name); } else - Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i but it has no model\n", NUM_FOR_EDICT(e), NUM_FOR_EDICT(tagentity), tagname, tagname, NUM_FOR_EDICT(tagentity)); + Con_DPrintf("setattachment(edict %i, edict %i, string \"%s\"): tried to find tag named \"%s\" on entity %i but it has no model\n", PRVM_NUM_FOR_EDICT(e), PRVM_NUM_FOR_EDICT(tagentity), tagname, tagname, PRVM_NUM_FOR_EDICT(tagentity)); } }*/ @@ -2118,13 +2074,13 @@ void VM_parseentitydata(void) // get edict and test it ent = PRVM_G_EDICT(OFS_PARM0); if (ent->priv.required->free) - PRVM_ERROR ("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent)); + PRVM_ERROR ("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!", PRVM_NAME, PRVM_NUM_FOR_EDICT(ent)); data = PRVM_G_STRING(OFS_PARM1); // parse the opening brace if (!COM_ParseToken(&data, false) || com_token[0] != '{' ) - PRVM_ERROR ("VM_parseentitydata: %s: Couldn't parse entity data:\n%s\n", PRVM_NAME, data ); + PRVM_ERROR ("VM_parseentitydata: %s: Couldn't parse entity data:\n%s", PRVM_NAME, data ); PRVM_ED_ParseEdict (data, ent); } @@ -2139,7 +2095,7 @@ loadfromfile(string file) void VM_loadfromfile(void) { const char *filename; - qbyte *data; + char *data; VM_SAFEPARMCOUNT(1,VM_loadfromfile); @@ -2156,7 +2112,7 @@ void VM_loadfromfile(void) } // not conform with VM_fopen - data = FS_LoadFile(filename, tempmempool, false); + data = (char *)FS_LoadFile(filename, tempmempool, false, NULL); if (data == NULL) PRVM_G_FLOAT(OFS_RETURN) = -1; @@ -2388,7 +2344,7 @@ void VM_precache_pic(void) PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0); if(!s) - PRVM_ERROR ("VM_precache_pic: %s: NULL\n", PRVM_NAME); + PRVM_ERROR ("VM_precache_pic: %s: NULL", PRVM_NAME); VM_CheckEmptyString (s); @@ -2413,7 +2369,7 @@ void VM_freepic(void) s = PRVM_G_STRING(OFS_PARM0); if(!s) - PRVM_ERROR ("VM_freepic: %s: NULL\n"); + PRVM_ERROR ("VM_freepic: %s: NULL"); VM_CheckEmptyString (s); @@ -2526,27 +2482,27 @@ float drawpic(vector position, string pic, vector size, vector rgb, float alpha, */ void VM_drawpic(void) { - const char *pic; + const char *picname; float *size, *pos, *rgb; int flag; VM_SAFEPARMCOUNT(6,VM_drawpic); - pic = PRVM_G_STRING(OFS_PARM1); + picname = PRVM_G_STRING(OFS_PARM1); - if(!pic) + if(!picname) { Con_Printf("VM_drawpic: %s passed null picture name !\n", PRVM_NAME); PRVM_G_FLOAT(OFS_RETURN) = -1; return; } - VM_CheckEmptyString (pic); + VM_CheckEmptyString (picname); // is pic cached ? no function yet for that if(!1) { - Con_Printf("VM_drawpic: %s: %s not cached !\n", PRVM_NAME, pic); + Con_Printf("VM_drawpic: %s: %s not cached !\n", PRVM_NAME, picname); PRVM_G_FLOAT(OFS_RETURN) = -4; return; } @@ -2566,7 +2522,7 @@ void VM_drawpic(void) if(pos[2] || size[2]) Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size"))); - DrawQ_Pic(pos[0], pos[1], pic, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag); + DrawQ_Pic(pos[0], pos[1], Draw_CachePic(picname, true), size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM4), flag); PRVM_G_FLOAT(OFS_RETURN) = 1; } @@ -2600,7 +2556,7 @@ void VM_drawfill(void) if(pos[2] || size[2]) Con_Printf("VM_drawstring: z value%c from %s discarded\n",(pos[2] && size[2]) ? 's' : 0,((pos[2] && size[2]) ? "pos and size" : (pos[2] ? "pos" : "size"))); - DrawQ_Pic(pos[0], pos[1], 0, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag); + DrawQ_Pic(pos[0], pos[1], NULL, size[0], size[1], rgb[0], rgb[1], rgb[2], PRVM_G_FLOAT(OFS_PARM3), flag); PRVM_G_FLOAT(OFS_RETURN) = 1; } @@ -2655,7 +2611,7 @@ void VM_getimagesize(void) p = PRVM_G_STRING(OFS_PARM0); if(!p) - PRVM_ERROR("VM_getimagepos: %s passed null picture name !\n", PRVM_NAME); + PRVM_ERROR("VM_getimagepos: %s passed null picture name !", PRVM_NAME); VM_CheckEmptyString (p); @@ -2666,6 +2622,45 @@ void VM_getimagesize(void) PRVM_G_VECTOR(OFS_RETURN)[2] = 0; } +/* +========= +VM_keynumtostring + +string keynumtostring(float keynum) +========= +*/ +void VM_keynumtostring (void) +{ + int keynum; + char *tmp; + VM_SAFEPARMCOUNT(1, VM_keynumtostring); + + keynum = PRVM_G_FLOAT(OFS_PARM0); + + tmp = VM_GetTempString(); + + strcpy(tmp, Key_KeynumToString(keynum)); + + PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp); +} + +/* +========= +VM_stringtokeynum + +float stringtokeynum(string key) +========= +*/ +void VM_stringtokeynum (void) +{ + const char *str; + VM_SAFEPARMCOUNT( 1, VM_keynumtostring ); + + str = PRVM_G_STRING( OFS_PARM0 ); + + PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str ); +} + // CL_Video interface functions /* @@ -2710,7 +2705,7 @@ void VM_cin_close( void ) name = PRVM_G_STRING( OFS_PARM0 ); VM_CheckEmptyString( name ); - CL_CloseVideo( CL_GetVideo( name ) ); + CL_CloseVideo( CL_GetVideoByName( name ) ); } /* @@ -2730,9 +2725,9 @@ void VM_cin_setstate( void ) name = PRVM_G_STRING( OFS_PARM0 ); VM_CheckEmptyString( name ); - state = PRVM_G_FLOAT( OFS_PARM1 ); + state = (clvideostate_t)((int)PRVM_G_FLOAT( OFS_PARM1 )); - video = CL_GetVideo( name ); + video = CL_GetVideoByName( name ); if( video && state > CLVIDEO_UNUSED && state < CLVIDEO_STATECOUNT ) CL_SetVideoState( video, state ); } @@ -2754,7 +2749,7 @@ void VM_cin_getstate( void ) name = PRVM_G_STRING( OFS_PARM0 ); VM_CheckEmptyString( name ); - video = CL_GetVideo( name ); + video = CL_GetVideoByName( name ); if( video ) PRVM_G_FLOAT( OFS_RETURN ) = (int)video->state; else @@ -2778,59 +2773,367 @@ void VM_cin_restart( void ) name = PRVM_G_STRING( OFS_PARM0 ); VM_CheckEmptyString( name ); - video = CL_GetVideo( name ); + video = CL_GetVideoByName( name ); if( video ) CL_RestartVideo( video ); } -//////////////////////////////////////// -// AltString functions -//////////////////////////////////////// +/* +============== +VM_vectorvectors + +Writes new values for v_forward, v_up, and v_right based on the given forward vector +vectorvectors(vector, vector) +============== +*/ +void VM_vectorvectors (void) +{ + VectorNormalize2(PRVM_G_VECTOR(OFS_PARM0), prog->globals.server->v_forward); + VectorVectors(prog->globals.server->v_forward, prog->globals.server->v_right, prog->globals.server->v_up); +} /* ======================== -VM_altstr_count +VM_drawline -float altstr_count(string) +void drawline(float width, vector pos1, vector pos2, vector rgb, float alpha, float flags) ======================== */ -void VM_altstr_count( void ) +void VM_drawline (void) { - const char *altstr, *pos; - int count; + float *c1, *c2, *rgb; + float alpha, width; + unsigned char flags; - VM_SAFEPARMCOUNT( 1, VM_altstr_count ); + VM_SAFEPARMCOUNT(6, VM_drawline); + width = PRVM_G_FLOAT(OFS_PARM0); + c1 = PRVM_G_VECTOR(OFS_PARM1); + c2 = PRVM_G_VECTOR(OFS_PARM2); + rgb = PRVM_G_VECTOR(OFS_PARM3); + alpha = PRVM_G_FLOAT(OFS_PARM4); + flags = PRVM_G_FLOAT(OFS_PARM5); + DrawQ_Line(width, c1[0], c1[1], c2[0], c2[1], rgb[0], rgb[1], rgb[2], alpha, flags); +} - altstr = PRVM_G_STRING( OFS_PARM0 ); - //VM_CheckEmptyString( altstr ); +//==================== +//QC POLYGON functions +//==================== - for( count = 0, pos = altstr ; *pos ; pos++ ) { - if( *pos == '\\' ) { - if( !*++pos ) { - break; - } - } else if( *pos == '\'' ) { - count++; - } - } +typedef struct +{ + rtexture_t *tex; + float data[36]; //[515]: enough for polygons + unsigned char flags; //[515]: + VM_POLYGON_2D and VM_POLYGON_FL4V flags +}vm_polygon_t; - PRVM_G_FLOAT( OFS_RETURN ) = (float) (count / 2); -} +//static float vm_polygon_linewidth = 1; +static mempool_t *vm_polygons_pool = NULL; +static unsigned char vm_current_vertices = 0; +static qboolean vm_polygons_initialized = false; +static vm_polygon_t *vm_polygons = NULL; +static unsigned long vm_polygons_num = 0, vm_drawpolygons_num = 0; //[515]: ok long on 64bit ? +static qboolean vm_polygonbegin = false; //[515]: for "no-crap-on-the-screen" check +#define VM_DEFPOLYNUM 64 //[515]: enough for default ? -/* -======================== -VM_altstr_prepare +#define VM_POLYGON_FL3V 16 //more than 2 vertices (used only for lines) +#define VM_POLYGON_FLLINES 32 +#define VM_POLYGON_FL2D 64 +#define VM_POLYGON_FL4V 128 //4 vertices -string altstr_prepare(string) -======================== -*/ -void VM_altstr_prepare( void ) +void VM_InitPolygons (void) { - char *outstr, *out; - const char *instr, *in; - int size; + vm_polygons_pool = Mem_AllocPool("VMPOLY", 0, NULL); + vm_polygons = Mem_Alloc(vm_polygons_pool, VM_DEFPOLYNUM*sizeof(vm_polygon_t)); + memset(vm_polygons, 0, VM_DEFPOLYNUM*sizeof(vm_polygon_t)); + vm_polygons_num = VM_DEFPOLYNUM; + vm_polygonbegin = vm_drawpolygons_num = 0; + vm_polygons_initialized = true; +} - VM_SAFEPARMCOUNT( 1, VM_altstr_prepare ); +void VM_DrawPolygonCallback (const entity_render_t *ent, int surfacenumber, const rtlight_t *rtlight) +{ + const vm_polygon_t *p = &vm_polygons[surfacenumber]; + int flags = p->flags & 0x0f; + + if(flags == DRAWFLAG_ADDITIVE) + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + else if(flags == DRAWFLAG_MODULATE) + GL_BlendFunc(GL_DST_COLOR, GL_ZERO); + else if(flags == DRAWFLAG_2XMODULATE) + GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR); + else + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + R_Mesh_TexBind(0, R_GetTexture(p->tex)); + + //[515]: is speed is max ? + if(p->flags & VM_POLYGON_FLLINES) //[515]: lines + { + qglLineWidth(p->data[13]); + qglBegin(GL_LINE_LOOP); + qglTexCoord1f (p->data[12]); + qglColor4f (p->data[20], p->data[21], p->data[22], p->data[23]); + qglVertex3f (p->data[0] , p->data[1], p->data[2]); + + qglTexCoord1f (p->data[14]); + qglColor4f (p->data[24], p->data[25], p->data[26], p->data[27]); + qglVertex3f (p->data[3] , p->data[4], p->data[5]); + + if(p->flags & VM_POLYGON_FL3V) + { + qglTexCoord1f (p->data[16]); + qglColor4f (p->data[28], p->data[29], p->data[30], p->data[31]); + qglVertex3f (p->data[6] , p->data[7], p->data[8]); + + if(p->flags & VM_POLYGON_FL4V) + { + qglTexCoord1f (p->data[18]); + qglColor4f (p->data[32], p->data[33], p->data[34], p->data[35]); + qglVertex3f (p->data[9] , p->data[10], p->data[11]); + } + } + qglEnd(); + } + else + { + qglBegin(GL_POLYGON); + qglTexCoord2f (p->data[12], p->data[13]); + qglColor4f (p->data[20], p->data[21], p->data[22], p->data[23]); + qglVertex3f (p->data[0] , p->data[1], p->data[2]); + + qglTexCoord2f (p->data[14], p->data[15]); + qglColor4f (p->data[24], p->data[25], p->data[26], p->data[27]); + qglVertex3f (p->data[3] , p->data[4], p->data[5]); + + qglTexCoord2f (p->data[16], p->data[17]); + qglColor4f (p->data[28], p->data[29], p->data[30], p->data[31]); + qglVertex3f (p->data[6] , p->data[7], p->data[8]); + + if(p->flags & VM_POLYGON_FL4V) + { + qglTexCoord2f (p->data[18], p->data[19]); + qglColor4f (p->data[32], p->data[33], p->data[34], p->data[35]); + qglVertex3f (p->data[9] , p->data[10], p->data[11]); + } + qglEnd(); + } +} + +void VM_AddPolygonTo2DScene (vm_polygon_t *p) +{ + drawqueuemesh_t mesh; + static int picelements[6] = {0, 1, 2, 0, 2, 3}; + + mesh.texture = p->tex; + mesh.data_element3i = picelements; + mesh.data_vertex3f = p->data; + mesh.data_texcoord2f = p->data + 12; + mesh.data_color4f = p->data + 20; + if(p->flags & VM_POLYGON_FL4V) + { + mesh.num_vertices = 4; + mesh.num_triangles = 2; + } + else + { + mesh.num_vertices = 3; + mesh.num_triangles = 1; + } + if(p->flags & VM_POLYGON_FLLINES) //[515]: lines + DrawQ_LineLoop (&mesh, (p->flags&0x0f)); + else + DrawQ_Mesh (&mesh, (p->flags&0x0f)); +} + +//void(string texturename, float flag, float 2d, float lines) R_BeginPolygon +void VM_R_PolygonBegin (void) +{ + vm_polygon_t *p; + const char *picname; + if(prog->argc < 2) + VM_SAFEPARMCOUNT(2, VM_R_PolygonBegin); + + if(!vm_polygons_initialized) + VM_InitPolygons(); + if(vm_polygonbegin) + { + Con_Printf("VM_R_PolygonBegin: called twice without VM_R_PolygonEnd after first\n"); + return; + } + if(vm_drawpolygons_num >= vm_polygons_num) + { + p = Mem_Alloc(vm_polygons_pool, 2 * vm_polygons_num * sizeof(vm_polygon_t)); + memset(p, 0, 2 * vm_polygons_num * sizeof(vm_polygon_t)); + memcpy(p, vm_polygons, vm_polygons_num * sizeof(vm_polygon_t)); + Mem_Free(vm_polygons); + vm_polygons = p; + vm_polygons_num *= 2; + } + p = &vm_polygons[vm_drawpolygons_num]; + picname = PRVM_G_STRING(OFS_PARM0); + if(picname[0]) + p->tex = Draw_CachePic(picname, true)->tex; + else + p->tex = r_texture_notexture; + p->flags = (unsigned char)PRVM_G_FLOAT(OFS_PARM1); + vm_current_vertices = 0; + vm_polygonbegin = true; + if(prog->argc >= 3) + { + if(PRVM_G_FLOAT(OFS_PARM2)) + p->flags |= VM_POLYGON_FL2D; + if(prog->argc >= 4 && PRVM_G_FLOAT(OFS_PARM3)) + { + p->data[13] = PRVM_G_FLOAT(OFS_PARM3); //[515]: linewidth + p->flags |= VM_POLYGON_FLLINES; + } + } +} + +//void(vector org, vector texcoords, vector rgb, float alpha) R_PolygonVertex +void VM_R_PolygonVertex (void) +{ + float *coords, *tx, *rgb, alpha; + vm_polygon_t *p; + VM_SAFEPARMCOUNT(4, VM_R_PolygonVertex); + + if(!vm_polygonbegin) + { + Con_Printf("VM_R_PolygonVertex: VM_R_PolygonBegin wasn't called\n"); + return; + } + coords = PRVM_G_VECTOR(OFS_PARM0); + tx = PRVM_G_VECTOR(OFS_PARM1); + rgb = PRVM_G_VECTOR(OFS_PARM2); + alpha = PRVM_G_FLOAT(OFS_PARM3); + + p = &vm_polygons[vm_drawpolygons_num]; + if(vm_current_vertices > 4) + { + Con_Printf("VM_R_PolygonVertex: may have 4 vertices max\n"); + return; + } + + p->data[vm_current_vertices*3] = coords[0]; + p->data[1+vm_current_vertices*3] = coords[1]; + if(!(p->flags & VM_POLYGON_FL2D)) + p->data[2+vm_current_vertices*3] = coords[2]; + + p->data[12+vm_current_vertices*2] = tx[0]; + if(!(p->flags & VM_POLYGON_FLLINES)) + p->data[13+vm_current_vertices*2] = tx[1]; + + p->data[20+vm_current_vertices*4] = rgb[0]; + p->data[21+vm_current_vertices*4] = rgb[1]; + p->data[22+vm_current_vertices*4] = rgb[2]; + p->data[23+vm_current_vertices*4] = alpha; + + vm_current_vertices++; + if(vm_current_vertices == 4) + p->flags |= VM_POLYGON_FL4V; + else + if(vm_current_vertices == 3) + p->flags |= VM_POLYGON_FL3V; +} + +//void() R_EndPolygon +void VM_R_PolygonEnd (void) +{ + if(!vm_polygonbegin) + { + Con_Printf("VM_R_PolygonEnd: VM_R_PolygonBegin wasn't called\n"); + return; + } + if(vm_current_vertices > 2 || (vm_current_vertices >= 2 && vm_polygons[vm_drawpolygons_num].flags & VM_POLYGON_FLLINES)) + { + if(vm_polygons[vm_drawpolygons_num].flags & VM_POLYGON_FL2D) //[515]: don't use qcpolygons memory if 2D + VM_AddPolygonTo2DScene(&vm_polygons[vm_drawpolygons_num]); + else + vm_drawpolygons_num++; + } + else + Con_Printf("VM_R_PolygonEnd: %i vertices isn't a good choice\n", vm_current_vertices); + vm_polygonbegin = false; +} + +void VM_AddPolygonsToMeshQueue (void) +{ + unsigned int i; + if(!vm_drawpolygons_num) + return; + for(i = 0;i < vm_drawpolygons_num;i++) + R_MeshQueue_Add(VM_DrawPolygonCallback, NULL, i, NULL); + vm_drawpolygons_num = 0; +} + + + + +// float(float number, float quantity) bitshift (EXT_BITSHIFT) +void VM_bitshift (void) +{ + int n1, n2; + VM_SAFEPARMCOUNT(2, VM_bitshift); + + n1 = (int)fabs((int)PRVM_G_FLOAT(OFS_PARM0)); + n2 = (int)PRVM_G_FLOAT(OFS_PARM1); + if(!n1) + PRVM_G_FLOAT(OFS_RETURN) = n1; + else + if(n2 < 0) + PRVM_G_FLOAT(OFS_RETURN) = (n1 >> -n2); + else + PRVM_G_FLOAT(OFS_RETURN) = (n1 << n2); +} + +//////////////////////////////////////// +// AltString functions +//////////////////////////////////////// + +/* +======================== +VM_altstr_count + +float altstr_count(string) +======================== +*/ +void VM_altstr_count( void ) +{ + const char *altstr, *pos; + int count; + + VM_SAFEPARMCOUNT( 1, VM_altstr_count ); + + altstr = PRVM_G_STRING( OFS_PARM0 ); + //VM_CheckEmptyString( altstr ); + + for( count = 0, pos = altstr ; *pos ; pos++ ) { + if( *pos == '\\' ) { + if( !*++pos ) { + break; + } + } else if( *pos == '\'' ) { + count++; + } + } + + PRVM_G_FLOAT( OFS_RETURN ) = (float) (count / 2); +} + +/* +======================== +VM_altstr_prepare + +string altstr_prepare(string) +======================== +*/ +void VM_altstr_prepare( void ) +{ + char *outstr, *out; + const char *instr, *in; + int size; + + VM_SAFEPARMCOUNT( 1, VM_altstr_prepare ); instr = PRVM_G_STRING( OFS_PARM0 ); //VM_CheckEmptyString( instr ); @@ -2990,11 +3293,495 @@ void VM_altstr_ins(void) PRVM_G_INT( OFS_RETURN ) = PRVM_SetEngineString( outstr ); } + +//////////////////////////////////////// +// BufString functions +//////////////////////////////////////// +//[515]: string buffers support +#define MAX_QCSTR_BUFFERS 128 +#define MAX_QCSTR_STRINGS 1024 + +typedef struct +{ + int num_strings; + char *strings[MAX_QCSTR_STRINGS]; +}qcstrbuffer_t; + +static qcstrbuffer_t *qcstringbuffers[MAX_QCSTR_BUFFERS]; +static int num_qcstringbuffers; +static int buf_sortpower; + +#define BUFSTR_BUFFER(a) (a>=MAX_QCSTR_BUFFERS) ? NULL : (qcstringbuffers[a]) +#define BUFSTR_ISFREE(a) (anum_strings<=0) ? 1 : 0 + +static int BufStr_FindFreeBuffer (void) +{ + int i; + if(num_qcstringbuffers == MAX_QCSTR_BUFFERS) + return -1; + for(i=0;inum_strings > 0) + { + for(i=0;inum_strings;i++) + if(b->strings[i]) + free(b->strings[i]); + num_qcstringbuffers--; + } + free(qcstringbuffers[index]); + qcstringbuffers[index] = NULL; + } +} + +static int BufStr_FindFreeString (qcstrbuffer_t *b) +{ + int i; + for(i=0;inum_strings;i++) + if(!b->strings[i] || !b->strings[i][0]) + return i; + if(i == MAX_QCSTR_STRINGS) return -1; + else return i; +} + +static int BufStr_SortStringsUP (const void *in1, const void *in2) +{ + const char *a, *b; + a = *((const char **) in1); + b = *((const char **) in2); + if(!a[0]) return 1; + if(!b[0]) return -1; + return strncmp(a, b, buf_sortpower); +} + +static int BufStr_SortStringsDOWN (const void *in1, const void *in2) +{ + const char *a, *b; + a = *((const char **) in1); + b = *((const char **) in2); + if(!a[0]) return 1; + if(!b[0]) return -1; + return strncmp(b, a, buf_sortpower); +} + +#ifdef REMOVETHIS +static void VM_BufStr_Init (void) +{ + memset(qcstringbuffers, 0, sizeof(qcstringbuffers)); + num_qcstringbuffers = 0; +} + +static void VM_BufStr_ShutDown (void) +{ + int i; + for(i=0;i= 0) + num_qcstringbuffers++; + //else + //Con_Printf("VM_buf_create: buffers overflow in %s\n", PRVM_NAME); + PRVM_G_FLOAT(OFS_RETURN) = i; +} + +/* +======================== +VM_buf_del +deletes buffer and all strings in it +void buf_del(float bufhandle) = #461; +======================== +*/ +void VM_buf_del (void) +{ + VM_SAFEPARMCOUNT(1, VM_buf_del); + if(BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0))) + BufStr_ClearBuffer((int)PRVM_G_FLOAT(OFS_PARM0)); + else + { + Con_Printf("VM_buf_del: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } +} + +/* +======================== +VM_buf_getsize +how many strings are stored in buffer +float buf_getsize(float bufhandle) = #462; +======================== +*/ +void VM_buf_getsize (void) +{ + qcstrbuffer_t *b; + VM_SAFEPARMCOUNT(1, VM_buf_getsize); + + b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)); + if(!b) + { + PRVM_G_FLOAT(OFS_RETURN) = -1; + Con_Printf("VM_buf_getsize: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } + else + PRVM_G_FLOAT(OFS_RETURN) = b->num_strings; +} + +/* +======================== +VM_buf_copy +copy all content from one buffer to another, make sure it exists +void buf_copy(float bufhandle_from, float bufhandle_to) = #463; +======================== +*/ +void VM_buf_copy (void) +{ + qcstrbuffer_t *b1, *b2; + int i; + VM_SAFEPARMCOUNT(2, VM_buf_copy); + + b1 = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)); + if(!b1) + { + Con_Printf("VM_buf_copy: invalid source buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } + i = PRVM_G_FLOAT(OFS_PARM1); + if(i == (int)PRVM_G_FLOAT(OFS_PARM0)) + { + Con_Printf("VM_buf_copy: source == destination (%i) in %s\n", i, PRVM_NAME); + return; + } + b2 = BUFSTR_BUFFER(i); + if(!b2) + { + Con_Printf("VM_buf_copy: invalid destination buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME); + return; + } + + BufStr_ClearBuffer(i); + qcstringbuffers[i] = malloc(sizeof(qcstrbuffer_t)); + memset(qcstringbuffers[i], 0, sizeof(qcstrbuffer_t)); + b2->num_strings = b1->num_strings; + + for(i=0;inum_strings;i++) + if(b1->strings[i] && b1->strings[i][0]) + { + b2->strings[i] = malloc(strlen(b1->strings[i])+1); + if(!b2->strings[i]) + { + Con_Printf("VM_buf_copy: not enough memory for buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM1), PRVM_NAME); + break; + } + strcpy(b2->strings[i], b1->strings[i]); + } +} + +/* +======================== +VM_buf_sort +sort buffer by beginnings of strings (sortpower defaults it's lenght) +"backward == TRUE" means that sorting goes upside-down +void buf_sort(float bufhandle, float sortpower, float backward) = #464; +======================== +*/ +void VM_buf_sort (void) +{ + qcstrbuffer_t *b; + int i; + VM_SAFEPARMCOUNT(3, VM_buf_sort); + + b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)); + if(!b) + { + Con_Printf("VM_buf_sort: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } + if(b->num_strings <= 0) + { + Con_Printf("VM_buf_sort: tried to sort empty buffer %i in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } + buf_sortpower = PRVM_G_FLOAT(OFS_PARM1); + if(buf_sortpower <= 0) + buf_sortpower = 99999999; + + if(!PRVM_G_FLOAT(OFS_PARM2)) + qsort(b->strings, b->num_strings, sizeof(char*), BufStr_SortStringsUP); + else + qsort(b->strings, b->num_strings, sizeof(char*), BufStr_SortStringsDOWN); + + for(i=b->num_strings-1;i>=0;i--) //[515]: delete empty lines + if(b->strings) + { + if(b->strings[i][0]) + break; + else + { + free(b->strings[i]); + --b->num_strings; + b->strings[i] = NULL; + } + } + else + --b->num_strings; +} + +/* +======================== +VM_buf_implode +concantenates all buffer string into one with "glue" separator and returns it as tempstring +string buf_implode(float bufhandle, string glue) = #465; +======================== +*/ +void VM_buf_implode (void) +{ + qcstrbuffer_t *b; + char *k; + const char *sep; + int i; + size_t l; + VM_SAFEPARMCOUNT(2, VM_buf_implode); + + b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)); + PRVM_G_INT(OFS_RETURN) = 0; + if(!b) + { + Con_Printf("VM_buf_implode: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } + if(!b->num_strings) + return; + sep = PRVM_G_STRING(OFS_PARM1); + k = VM_GetTempString(); + k[0] = 0; + for(l=i=0;inum_strings;i++) + if(b->strings[i]) + { + l += strlen(b->strings[i]); + if(l>=4095) + break; + k = strcat(k, b->strings[i]); + if(!k) + break; + if(sep && (i != b->num_strings-1)) + { + l += strlen(sep); + if(l>=4095) + break; + k = strcat(k, sep); + if(!k) + break; + } + } + PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(k); +} + +/* +======================== +VM_bufstr_get +get a string from buffer, returns direct pointer, dont str_unzone it! +string bufstr_get(float bufhandle, float string_index) = #465; +======================== +*/ +void VM_bufstr_get (void) +{ + qcstrbuffer_t *b; + int strindex; + VM_SAFEPARMCOUNT(2, VM_bufstr_get); + + b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)); + if(!b) + { + Con_Printf("VM_bufstr_get: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } + strindex = (int)PRVM_G_FLOAT(OFS_PARM1); + if(strindex < 0 || strindex > MAX_QCSTR_STRINGS) + { + Con_Printf("VM_bufstr_get: invalid string index %i used in %s\n", strindex, PRVM_NAME); + return; + } + PRVM_G_INT(OFS_RETURN) = 0; + if(b->num_strings <= strindex) + return; + if(b->strings[strindex]) + PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(b->strings[strindex]); +} + +/* +======================== +VM_bufstr_set +copies a string into selected slot of buffer +void bufstr_set(float bufhandle, float string_index, string str) = #466; +======================== +*/ +void VM_bufstr_set (void) +{ + int bufindex, strindex; + qcstrbuffer_t *b; + const char *news; + + VM_SAFEPARMCOUNT(3, VM_bufstr_set); + + bufindex = PRVM_G_FLOAT(OFS_PARM0); + b = BUFSTR_BUFFER(bufindex); + if(!b) + { + Con_Printf("VM_bufstr_set: invalid buffer %i used in %s\n", bufindex, PRVM_NAME); + return; + } + strindex = PRVM_G_FLOAT(OFS_PARM1); + if(strindex < 0 || strindex > MAX_QCSTR_STRINGS) + { + Con_Printf("VM_bufstr_set: invalid string index %i used in %s\n", strindex, PRVM_NAME); + return; + } + news = PRVM_G_STRING(OFS_PARM2); + if(!news) + { + Con_Printf("VM_bufstr_set: null string used in %s\n", PRVM_NAME); + return; + } + if(b->strings[strindex]) + free(b->strings[strindex]); + b->strings[strindex] = malloc(strlen(news)+1); + strcpy(b->strings[strindex], news); +} + +/* +======================== +VM_bufstr_add +adds string to buffer in nearest free slot and returns it +"order == TRUE" means that string will be added after last "full" slot +float bufstr_add(float bufhandle, string str, float order) = #467; +======================== +*/ +void VM_bufstr_add (void) +{ + int bufindex, order, strindex; + qcstrbuffer_t *b; + const char *string; + + VM_SAFEPARMCOUNT(3, VM_bufstr_add); + + bufindex = PRVM_G_FLOAT(OFS_PARM0); + b = BUFSTR_BUFFER(bufindex); + PRVM_G_FLOAT(OFS_RETURN) = -1; + if(!b) + { + Con_Printf("VM_bufstr_add: invalid buffer %i used in %s\n", bufindex, PRVM_NAME); + return; + } + string = PRVM_G_STRING(OFS_PARM1); + if(!string) + { + Con_Printf("VM_bufstr_add: null string used in %s\n", PRVM_NAME); + return; + } + + order = PRVM_G_FLOAT(OFS_PARM2); + if(order) + strindex = b->num_strings; + else + { + strindex = BufStr_FindFreeString(b); + if(strindex < 0) + { + Con_Printf("VM_bufstr_add: buffer %i has no free string slots in %s\n", bufindex, PRVM_NAME); + return; + } + } + + while(b->num_strings <= strindex) + { + if(b->num_strings == MAX_QCSTR_STRINGS) + { + Con_Printf("VM_bufstr_add: buffer %i has no free string slots in %s\n", bufindex, PRVM_NAME); + return; + } + b->strings[b->num_strings] = NULL; + b->num_strings++; + } + if(b->strings[strindex]) + free(b->strings[strindex]); + b->strings[strindex] = malloc(strlen(string)+1); + strcpy(b->strings[strindex], string); + PRVM_G_FLOAT(OFS_RETURN) = strindex; +} + +/* +======================== +VM_bufstr_free +delete string from buffer +void bufstr_free(float bufhandle, float string_index) = #468; +======================== +*/ +void VM_bufstr_free (void) +{ + int i; + qcstrbuffer_t *b; + VM_SAFEPARMCOUNT(2, VM_bufstr_free); + + b = BUFSTR_BUFFER((int)PRVM_G_FLOAT(OFS_PARM0)); + if(!b) + { + Con_Printf("VM_bufstr_free: invalid buffer %i used in %s\n", (int)PRVM_G_FLOAT(OFS_PARM0), PRVM_NAME); + return; + } + i = PRVM_G_FLOAT(OFS_PARM1); + if(i < 0 || i > MAX_QCSTR_STRINGS) + { + Con_Printf("VM_bufstr_free: invalid string index %i used in %s\n", i, PRVM_NAME); + return; + } + if(b->strings[i]) + free(b->strings[i]); + b->strings[i] = NULL; + if(i+1 == b->num_strings) + --b->num_strings; +} + +//============= + void VM_Cmd_Init(void) { // only init the stuff for the current prog VM_Files_Init(); VM_Search_Init(); +// VM_BufStr_Init(); + if(vm_polygons_initialized) + { + Mem_FreePool(&vm_polygons_pool); + vm_polygons_initialized = false; + } } void VM_Cmd_Reset(void) @@ -3002,6 +3789,11 @@ void VM_Cmd_Reset(void) CL_PurgeOwner( MENUOWNER ); VM_Search_Reset(); VM_Files_CloseAll(); +// VM_BufStr_ShutDown(); + if(vm_polygons_initialized) + { + Mem_FreePool(&vm_polygons_pool); + vm_polygons_initialized = false; + } } -