X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=prvm_cmds.c;h=5dc7a50c963577b38672c6de320ab85643d78e9c;hb=a845e9f59600c6443cfca0517d9c30ee9f0904b9;hp=bfc904d3a99600d9384035bf4a6382ba6992926a;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2;p=xonotic%2Fdarkplaces.git diff --git a/prvm_cmds.c b/prvm_cmds.c index bfc904d3..5dc7a50c 100644 --- a/prvm_cmds.c +++ b/prvm_cmds.c @@ -96,6 +96,9 @@ float search_getsize(float handle) string search_getfilename(float handle, float num) string chr(float ascii) + +float itof(intt ent) +intt ftoi(float num) perhaps only : Menu : WriteMsg =============================== @@ -142,7 +145,7 @@ string findkeysforcommand(string command) float gethostcachevalue(float type) string gethostcachestring(float type, float hostnr) - + parseentitydata(entity ent, string data) */ #include "quakedef.h" @@ -180,11 +183,6 @@ mempool_t *vm_strings_mempool[PRVM_MAXPROGS]; static char vm_string_temp[VM_STRINGTEMP_BUFFERS][VM_STRINGTEMP_LENGTH]; static int vm_string_tempindex = 0; -// qc cvar -#define MAX_QC_CVARS 128 * PRVM_MAXPROGS -cvar_t vm_qc_cvar[MAX_QC_CVARS]; -int vm_currentqc_cvar; - // qc file handling #define MAX_VMFILES 256 #define MAX_PRVMFILES MAX_VMFILES * PRVM_MAXPROGS @@ -629,14 +627,13 @@ void VM_localsound(void) s = PRVM_G_STRING(OFS_PARM0); - if(!S_GetCached(s)) + if(!S_LocalSound (s)) { - Con_Printf("VM_localsound: %s : %s not cached !\n", PRVM_NAME, s); + Con_Printf("VM_localsound: Failed to play %s for %s !\n", s, PRVM_NAME); PRVM_G_FLOAT(OFS_RETURN) = -4; return; } - S_LocalSound(s); PRVM_G_FLOAT(OFS_RETURN) = 1; } @@ -711,7 +708,7 @@ void VM_str_cvar(void) strcpy(out, cvar_string); - PRVM_G_INT(OFS_PARM0) = PRVM_SetString(out); + PRVM_G_INT(OFS_RETURN) = PRVM_SetString(out); } /* @@ -840,6 +837,38 @@ void VM_stof(void) PRVM_G_FLOAT(OFS_RETURN) = atof(string); } +/* +======================== +VM_itof + +float itof(intt ent) +======================== +*/ +void VM_itof(void) +{ + VM_SAFEPARMCOUNT(1, VM_itof); + PRVM_G_FLOAT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0); +} + +/* +======================== +VM_itoe + +intt ftoi(float num) +======================== +*/ +void VM_ftoi(void) +{ + int ent; + VM_SAFEPARMCOUNT(1, VM_ftoi); + + ent = PRVM_G_FLOAT(OFS_PARM0); + if(PRVM_PROG_TO_EDICT(ent)->p.e->free) + PRVM_ERROR ("VM_ftoe: %s tried to access a freed entity (entity %i)!\n", PRVM_NAME, ent); + + PRVM_G_INT(OFS_RETURN) = ent; +} + /* ========= VM_spawn @@ -860,7 +889,7 @@ void VM_spawn (void) ========= VM_remove -entity remove() +remove(entity e) ========= */ @@ -911,7 +940,7 @@ void VM_find (void) { prog->xfunction->builtinsprofile++; ed = PRVM_EDICT_NUM(e); - if (ed->e->free) + if (ed->p.e->free) continue; t = PRVM_E_STRING(ed,f); if (!t) @@ -952,7 +981,7 @@ void VM_findfloat (void) { prog->xfunction->builtinsprofile++; ed = PRVM_EDICT_NUM(e); - if (ed->e->free) + if (ed->p.e->free) continue; if (PRVM_E_FLOAT(ed,f) == s) { @@ -1004,7 +1033,7 @@ void VM_findchain (void) for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) { prog->xfunction->builtinsprofile++; - if (ent->e->free) + if (ent->p.e->free) continue; t = PRVM_E_STRING(ent,f); if (!t) @@ -1053,7 +1082,7 @@ void VM_findchainfloat (void) for (i = 1;i < prog->num_edicts;i++, ent = PRVM_NEXT_EDICT(ent)) { prog->xfunction->builtinsprofile++; - if (ent->e->free) + if (ent->p.e->free) continue; if (E_FLOAT(ent,f) != s) continue; @@ -1109,14 +1138,8 @@ void VM_precache_sound (void) PRVM_G_INT(OFS_RETURN) = PRVM_G_INT(OFS_PARM0); VM_CheckEmptyString (s); - if(S_GetCached(s)) - { - Con_Printf("VM_precache_sound: %s already cached (%s)\n", s, PRVM_NAME); - return; - } - - if(!S_PrecacheSound(s,true)) - Con_Printf("VM_prache_sound: Failed to load %s for %s\n", s, PRVM_NAME); + if(!S_PrecacheSound (s,true, true)) + Con_Printf("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME); } /* @@ -1279,7 +1302,7 @@ void VM_nextent (void) return; } ent = PRVM_EDICT_NUM(i); - if (!ent->e->free) + if (!ent->p.e->free) { VM_RETURN_EDICT(ent); return; @@ -1361,12 +1384,12 @@ void VM_WriteLong (void) void VM_WriteAngle (void) { - MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); + MSG_WriteAngle (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol); } void VM_WriteCoord (void) { - MSG_WriteDPCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0)); + MSG_WriteCoord (VM_WriteDest(), PRVM_G_FLOAT(OFS_PARM0), sv.protocol); } void VM_WriteString (void) @@ -1496,8 +1519,7 @@ float registercvar (string name, string value, float flags) void VM_registercvar (void) { char *name, *value; - cvar_t *variable; - int flags; + int flags; VM_SAFEPARMCOUNT(3,VM_registercvar); @@ -1520,19 +1542,8 @@ void VM_registercvar (void) return; } - if (vm_currentqc_cvar >= MAX_QC_CVARS) - PRVM_ERROR ("VM_registercvar: ran out of cvar slots (%i)\n", MAX_QC_CVARS); + Cvar_Get(name, value, 0); -// copy the name and value - variable = &vm_qc_cvar[vm_currentqc_cvar++]; - variable->flags = flags; - variable->name = Z_Malloc (strlen(name)+1); - strcpy (variable->name, name); - variable->string = Z_Malloc (strlen(value)+1); - strcpy (variable->string, value); - variable->value = atof (value); - - Cvar_RegisterVariable(variable); PRVM_G_FLOAT(OFS_RETURN) = 1; // success } @@ -1746,6 +1757,9 @@ void VM_fopen(void) return; } VM_FILES[filenum] = FS_Open(va("data/%s", filename), modestring, false); + if (VM_FILES[filenum] == NULL && mode == 0) + VM_FILES[filenum] = FS_Open(va("%s", filename), modestring, false); + if (VM_FILES[filenum] == NULL) PRVM_G_FLOAT(OFS_RETURN) = -1; else @@ -1823,7 +1837,7 @@ void VM_fgets(void) c = FS_Getc(VM_FILES[filenum]); if (developer.integer) Con_Printf("fgets: %s: %s\n", PRVM_NAME, string); - if (c >= 0) + if (c >= 0 || end) PRVM_G_INT(OFS_RETURN) = PRVM_SetString(string); else PRVM_G_INT(OFS_RETURN) = 0; @@ -1898,8 +1912,8 @@ void VM_strcat(void) { char *s; - if(prog->argc < 2) - PRVM_ERROR("VM_strcat wrong parameter count (min. 2 expected ) !\n"); + if(prog->argc < 1) + PRVM_ERROR("VM_strcat wrong parameter count (min. 1 expected ) !\n"); s = VM_GetTempString(); VM_VarString(0, s, VM_STRINGTEMP_LENGTH); @@ -1983,9 +1997,14 @@ strunzone(string s) //void(string s) strunzone = #119; // removes a copy of a string from the string zone (you can not use that string again or it may crash!!!) void VM_strunzone(void) { + char *str; VM_SAFEPARMCOUNT(1,VM_strunzone); - Mem_Free(PRVM_G_STRING(OFS_PARM0)); + str = PRVM_G_STRING(OFS_PARM0); + if( developer.integer && !Mem_IsAllocated( VM_STRINGS_MEMPOOL, str ) ) + PRVM_ERROR( "VM_strunzone: Zone string already freed in %s!", PRVM_NAME ); + else + Mem_Free( str ); } /* @@ -2114,6 +2133,7 @@ void PF_setattachment (void) 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; + // FIXME: use a model function to get tag info (need to handle skeletal) if (v->_float == 0 && model->alias.aliasnum_tags) for (i = 0;i < model->alias.aliasnum_tags;i++) if (!strcmp(tagname, model->alias.aliasdata_tags[i].name)) @@ -2239,6 +2259,34 @@ void VM_loadfromdata(void) PRVM_ED_LoadFromFile(PRVM_G_STRING(OFS_PARM0)); } +/* +======================== +VM_M_parseentitydata + +parseentitydata(entity ent, string data) +======================== +*/ +void VM_M_parseentitydata(void) +{ + prvm_edict_t *ent; + const char *data; + + VM_SAFEPARMCOUNT(2, VM_parseentitydata); + + // get edict and test it + ent = PRVM_G_EDICT(OFS_PARM0); + if (ent->p.e->free) + PRVM_ERROR ("VM_parseentitydata: %s: Can only set already spawned entities (entity %i is free)!\n", 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_ED_ParseEdict (data, ent); +} + /* ========= VM_loadfromfile @@ -2266,7 +2314,7 @@ void VM_loadfromfile(void) } // not conform with VM_fopen - data = FS_LoadFile(filename, false); + data = FS_LoadFile(filename, tempmempool, false); if (data == NULL) PRVM_G_FLOAT(OFS_RETURN) = -1; @@ -2778,7 +2826,7 @@ void VM_getimagesize(void) void VM_Cmd_Init(void) { // only init the stuff for the current prog - VM_STRINGS_MEMPOOL = Mem_AllocPool(va("vm_stringsmempool[%s]",PRVM_NAME)); + VM_STRINGS_MEMPOOL = Mem_AllocPool(va("vm_stringsmempool[%s]",PRVM_NAME), 0, NULL); VM_Files_Init(); VM_Search_Init(); } @@ -2944,6 +2992,7 @@ void VM_M_getkeydest(void) VM_M_callfunction callfunction(...,string function_name) +Extension: pass ========= */ mfunction_t *PRVM_ED_FindFunction (const char *name); @@ -3041,7 +3090,7 @@ void VM_M_writetofile(void) } ent = PRVM_G_EDICT(OFS_PARM1); - if(ent->e->free) + if(ent->p.e->free) { Con_Printf("VM_M_writetofile: %s: entity %i is free !\n", PRVM_NAME, PRVM_EDICT_NUM(OFS_PARM1)); return; @@ -3297,8 +3346,9 @@ prvm_builtin_t vm_m_builtins[] = { VM_search_end, VM_search_getsize, VM_search_getfilename, // 77 - VM_chr, //78 - 0,0,// 80 + VM_chr, + VM_itof, + VM_ftoi,// 80 e10, // 90 e10, // 100 e100, // 200 @@ -3347,7 +3397,8 @@ prvm_builtin_t vm_m_builtins[] = { VM_M_keynumtostring, VM_M_findkeysforcommand,// 610 VM_M_gethostcachevalue, - VM_M_gethostcachestring // 612 + VM_M_gethostcachestring, + VM_M_parseentitydata // 613 }; const int vm_m_numbuiltins = sizeof(vm_m_builtins) / sizeof(prvm_builtin_t);