X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=csprogs.c;h=39dbc6ff664cd1adc5c4bf54dd76141cd107a4f6;hp=1acbddfb36a7df4bc6b9dcc26fbd99ce2394f90f;hb=cc3473e216fce052672ec4600896124584866e52;hpb=7524b6e52cb1853ad546dc5f317bbb6fd7fc7a94 diff --git a/csprogs.c b/csprogs.c index 1acbddfb..39dbc6ff 100644 --- a/csprogs.c +++ b/csprogs.c @@ -3,6 +3,8 @@ #include "clprogdefs.h" #include "csprogs.h" #include "cl_collision.h" +#include "snd_main.h" +#include "clvm_cmds.h" //============================================================================ // Client prog handling @@ -20,21 +22,10 @@ static char *cl_required_func[] = "CSQC_InputEvent", "CSQC_UpdateView", "CSQC_ConsoleCommand", - "CSQC_Shutdown" }; static int cl_numrequiredfunc = sizeof(cl_required_func) / sizeof(char*); -static char *csqc_printtextbuf = NULL; -static unsigned short *csqc_sv2csqcents; //[515]: server entities numbers on client side. FIXME : make pointers instead of numbers ? - -qboolean csqc_loaded = false; - -vec3_t csqc_origin, csqc_angles; -static double csqc_frametime = 0; - -static mempool_t *csqc_mempool; - void CL_VM_Error (const char *format, ...) DP_FUNC_PRINTF(1); void CL_VM_Error (const char *format, ...) //[515]: hope it will be never executed =) { @@ -47,8 +38,7 @@ void CL_VM_Error (const char *format, ...) //[515]: hope it will be never execut // Con_Printf( "CL_VM_Error: %s\n", errorstring ); PRVM_Crash(); - csqc_loaded = false; - Mem_FreePool(&csqc_mempool); + cl.csqc_loaded = false; Cvar_SetValueQuick(&csqc_progcrc, -1); Cvar_SetValueQuick(&csqc_progsize, -1); @@ -56,28 +46,54 @@ void CL_VM_Error (const char *format, ...) //[515]: hope it will be never execut // Host_AbortCurrentFrame(); //[515]: hmmm... if server says it needs csqc then client MUST disconnect Host_Error(va("CL_VM_Error: %s", errorstring)); } - +void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin) +{ + prvm_eval_t *val; + if(cl.csqc_loaded) + { + CSQC_BEGIN + val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_take); + if(val) + val->_float = dmg_take; + val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_save); + if(val) + val->_float = dmg_save; + val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.dmg_origin); + if(val) + { + val->vector[0] = dmg_origin[0]; + val->vector[1] = dmg_origin[1]; + val->vector[2] = dmg_origin[2]; + } + CSQC_END + } +} //[515]: set globals before calling R_UpdateView, WEIRD CRAP static void CSQC_SetGlobals (void) { - //extern cvar_t sv_accelerate, sv_friction, sv_gravity, sv_stopspeed, sv_maxspeed; - + prvm_eval_t *val; CSQC_BEGIN prog->globals.client->time = cl.time; - prog->globals.client->frametime = cl.time - csqc_frametime; - csqc_frametime = cl.time; + prog->globals.client->frametime = max(0, cl.time - cl.oldtime); prog->globals.client->servercommandframe = cls.servermovesequence; - prog->globals.client->clientcommandframe = cls.movesequence; + prog->globals.client->clientcommandframe = cl.movecmd[0].sequence; VectorCopy(cl.viewangles, prog->globals.client->input_angles); - VectorCopy(cl.viewangles, csqc_angles); - prog->globals.client->input_buttons = cl.cmd.buttons; - VectorSet(prog->globals.client->input_movevalues, cl.cmd.forwardmove, cl.cmd.sidemove, cl.cmd.upmove); - //VectorCopy(cl.movement_origin, csqc_origin); - Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, csqc_origin); - VectorCopy(csqc_origin, prog->globals.client->pmove_org); - prog->globals.client->maxclients = cl.maxclients; - //VectorCopy(cl.movement_velocity, prog->globals.client->pmove_vel); + VectorCopy(cl.viewangles, cl.csqc_angles); + // // FIXME: this actually belongs into getinputstate().. [12/17/2007 Black] + prog->globals.client->input_buttons = cl.movecmd[0].buttons; + VectorSet(prog->globals.client->input_movevalues, cl.movecmd[0].forwardmove, cl.movecmd[0].sidemove, cl.movecmd[0].upmove); + //VectorCopy(cl.movement_origin, cl.csqc_origin); + Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, cl.csqc_origin); + + // LordHavoc: Spike says not to do this, but without pmove_org the + // CSQC is useless as it can't alter the view origin without + // completely replacing it + VectorCopy(cl.csqc_origin, prog->globals.client->pmove_org); VectorCopy(cl.velocity, prog->globals.client->pmove_vel); + + if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.view_angles))) + VectorCopy(cl.viewangles, val->vector); + prog->globals.client->maxclients = cl.maxclients; CSQC_END } @@ -110,32 +126,31 @@ extern cvar_t cl_noplayershadow; qboolean CSQC_AddRenderEdict(prvm_edict_t *ed) { int renderflags; + int c; float scale; prvm_eval_t *val; - entity_t *e; - model_t *model; + entity_render_t *entrender; + dp_model_t *model; matrix4x4_t tagmatrix, matrix2; model = CL_GetModelFromEdict(ed); if (!model) return false; - e = CL_NewTempEntity(); - if (!e) + entrender = CL_NewTempEntity(); + if (!entrender) return false; - e->render.model = model; - e->render.colormap = (int)ed->fields.client->colormap; - e->render.frame = (int)ed->fields.client->frame; - e->render.skinnum = (int)ed->fields.client->skin; - e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE); + entrender->model = model; + entrender->skinnum = (int)ed->fields.client->skin; + entrender->effects |= entrender->model->effects; scale = 1; renderflags = 0; if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.renderflags)) && val->_float) renderflags = (int)val->_float; - if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float) e->render.alpha = val->_float; - if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float) e->render.scale = scale = val->_float; - if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, e->render.colormod); - if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float) e->render.effects = (int)val->_float; + if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float) entrender->alpha = val->_float; + if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float) entrender->scale = scale = val->_float; + if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector)) VectorCopy(val->vector, entrender->colormod); + if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float) entrender->effects |= (int)val->_float; if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict) { int tagentity; @@ -143,8 +158,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed) tagentity = val->edict; if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_index)) && val->_float) tagindex = (int)val->_float; - // FIXME: calculate tag matrix - Matrix4x4_CreateIdentity(&tagmatrix); + CL_GetTagMatrix (&tagmatrix, PRVM_PROG_TO_EDICT(tagentity), tagindex); } else Matrix4x4_CreateIdentity(&tagmatrix); @@ -161,7 +175,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed) vec3_t angles; VectorCopy(ed->fields.client->angles, angles); // if model is alias, reverse pitch direction - if (e->render.model->type == mod_alias) + if (entrender->model->type == mod_alias) angles[0] = -angles[0]; // set up the render matrix @@ -173,70 +187,95 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed) // self.frame1time is the animation base time for the interpolation target // self.frame2 is the interpolation start (previous frame) // self.frame2time is the animation base time for the interpolation start - e->render.frame1 = e->render.frame = ed->fields.client->frame; - if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) e->render.frame1 = val->_float; - if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) e->render.frame2time = val->_float; - if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) e->render.frame1time = val->_float; - if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) e->render.framelerp = val->_float; + entrender->frame1 = entrender->frame2 = ed->fields.client->frame; + if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) entrender->frame2 = val->_float; + if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) entrender->frame2time = val->_float; + if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) entrender->frame1time = val->_float; + if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) entrender->framelerp = val->_float; // concat the matrices to make the entity relative to its tag - Matrix4x4_Concat(&e->render.matrix, &tagmatrix, &matrix2); - // make the other useful stuff - CL_UpdateRenderEntity(&e->render); + Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2); if(renderflags) { - if(renderflags & RF_VIEWMODEL) e->render.flags |= RENDER_VIEWMODEL; - if(renderflags & RF_EXTERNALMODEL)e->render.flags |= RENDER_EXTERIORMODEL; - if(renderflags & RF_DEPTHHACK) e->render.effects |= EF_NODEPTHTEST; - if(renderflags & RF_ADDITIVE) e->render.effects |= EF_ADDITIVE; + if(renderflags & RF_VIEWMODEL) entrender->flags |= RENDER_VIEWMODEL; + if(renderflags & RF_EXTERNALMODEL)entrender->flags |= RENDER_EXTERIORMODEL; + if(renderflags & RF_DEPTHHACK) entrender->effects |= EF_NODEPTHTEST; + if(renderflags & RF_ADDITIVE) entrender->effects |= EF_ADDITIVE; } + c = (int)ed->fields.client->colormap; + if (c <= 0) + CL_SetEntityColormapColors(entrender, -1); + else if (c <= cl.maxclients && cl.scores != NULL) + CL_SetEntityColormapColors(entrender, cl.scores[c-1].colors); + else + CL_SetEntityColormapColors(entrender, c); + // either fullbright or lit - if (!(e->render.effects & EF_FULLBRIGHT) && !r_fullbright.integer) - e->render.flags |= RENDER_LIGHT; + if (!(entrender->effects & EF_FULLBRIGHT) && !r_fullbright.integer) + entrender->flags |= RENDER_LIGHT; // hide player shadow during intermission or nehahra movie - if (!(e->render.effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST)) - && (e->render.alpha >= 1) - && !(e->render.flags & RENDER_VIEWMODEL) - && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer))) - e->render.flags |= RENDER_SHADOW; - if (e->render.flags & (RENDER_EXTERIORMODEL | RENDER_VIEWMODEL)) - e->render.flags |= RENDER_NOSELFSHADOW; + if (!(entrender->effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST)) + && (entrender->alpha >= 1) + && !(entrender->flags & RENDER_VIEWMODEL) + && (!(entrender->flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer))) + entrender->flags |= RENDER_SHADOW; + if (entrender->flags & RENDER_VIEWMODEL) + entrender->flags |= RENDER_NOSELFSHADOW; + + // make the other useful stuff + CL_UpdateRenderEntity(entrender); return true; } -qboolean CL_VM_InputEvent (qboolean pressed, int key) +qboolean CL_VM_InputEvent (qboolean down, int key, int ascii) { qboolean r; - if(!csqc_loaded) + + if(!cl.csqc_loaded) return false; + CSQC_BEGIN - prog->globals.client->time = cl.time; - PRVM_G_FLOAT(OFS_PARM0) = pressed; - PRVM_G_FLOAT(OFS_PARM1) = key; - PRVM_ExecuteProgram(prog->funcoffsets.CSQC_InputEvent, "QC function CSQC_InputEvent is missing"); - r = CSQC_RETURNVAL; + if (!prog->funcoffsets.CSQC_InputEvent) + r = false; + else + { + prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; + PRVM_G_FLOAT(OFS_PARM0) = !down; // 0 is down, 1 is up + PRVM_G_FLOAT(OFS_PARM1) = key; + PRVM_G_FLOAT(OFS_PARM2) = ascii; + PRVM_ExecuteProgram(prog->funcoffsets.CSQC_InputEvent, "QC function CSQC_InputEvent is missing"); + r = CSQC_RETURNVAL; + } CSQC_END return r; } qboolean CL_VM_UpdateView (void) { + vec3_t emptyvector; + emptyvector[0] = 0; + emptyvector[1] = 0; + emptyvector[2] = 0; // vec3_t oldangles; - if(!csqc_loaded) + if(!cl.csqc_loaded) return false; CSQC_BEGIN //VectorCopy(cl.viewangles, oldangles); prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; CSQC_SetGlobals(); // clear renderable entity and light lists to prevent crashes if the // CSQC_UpdateView function does not call R_ClearScene as it should - r_refdef.numentities = 0; - r_refdef.numlights = 0; + r_refdef.scene.numentities = 0; + r_refdef.scene.numlights = 0; PRVM_ExecuteProgram(prog->funcoffsets.CSQC_UpdateView, "QC function CSQC_UpdateView is missing"); //VectorCopy(oldangles, cl.viewangles); + // Dresk : Reset Dmg Globals Here + CL_VM_UpdateDmgGlobals(0, 0, emptyvector); CSQC_END return true; } @@ -245,16 +284,20 @@ extern sizebuf_t vm_tempstringsbuf; qboolean CL_VM_ConsoleCommand (const char *cmd) { int restorevm_tempstringsbuf_cursize; - qboolean r; - if(!csqc_loaded) + qboolean r = false; + if(!cl.csqc_loaded) return false; CSQC_BEGIN + if (prog->funcoffsets.CSQC_ConsoleCommand) + { prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(cmd); PRVM_ExecuteProgram(prog->funcoffsets.CSQC_ConsoleCommand, "QC function CSQC_ConsoleCommand is missing"); vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; r = CSQC_RETURNVAL; + } CSQC_END return r; } @@ -263,13 +306,14 @@ qboolean CL_VM_Parse_TempEntity (void) { int t; qboolean r = false; - if(!csqc_loaded) + if(!cl.csqc_loaded) return false; CSQC_BEGIN if(prog->funcoffsets.CSQC_Parse_TempEntity) { t = msg_readcount; prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_TempEntity, "QC function CSQC_Parse_TempEntity is missing"); r = CSQC_RETURNVAL; if(!r) @@ -302,7 +346,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) csqc_progsize.flags = sizeflags; return; } - if(!csqc_loaded) + if(!cl.csqc_loaded) { Cbuf_AddText(msg); return; @@ -311,6 +355,7 @@ void CL_VM_Parse_StuffCmd (const char *msg) if(prog->funcoffsets.CSQC_Parse_StuffCmd) { prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg); PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_StuffCmd, "QC function CSQC_Parse_StuffCmd is missing"); @@ -325,6 +370,7 @@ static void CL_VM_Parse_Print (const char *msg) { int restorevm_tempstringsbuf_cursize; prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg); PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_Print, "QC function CSQC_Parse_Print is missing"); @@ -334,7 +380,7 @@ static void CL_VM_Parse_Print (const char *msg) void CSQC_AddPrintText (const char *msg) { size_t i; - if(!csqc_loaded) + if(!cl.csqc_loaded) { Con_Print(msg); return; @@ -346,18 +392,18 @@ void CSQC_AddPrintText (const char *msg) i = strlen(msg)-1; if(msg[i] != '\n' && msg[i] != '\r') { - if(strlen(csqc_printtextbuf)+i >= MAX_INPUTLINE) + if(strlen(cl.csqc_printtextbuf)+i >= MAX_INPUTLINE) { - CL_VM_Parse_Print(csqc_printtextbuf); - csqc_printtextbuf[0] = 0; + CL_VM_Parse_Print(cl.csqc_printtextbuf); + cl.csqc_printtextbuf[0] = 0; } else - strlcat(csqc_printtextbuf, msg, MAX_INPUTLINE); + strlcat(cl.csqc_printtextbuf, msg, MAX_INPUTLINE); return; } - strlcat(csqc_printtextbuf, msg, MAX_INPUTLINE); - CL_VM_Parse_Print(csqc_printtextbuf); - csqc_printtextbuf[0] = 0; + strlcat(cl.csqc_printtextbuf, msg, MAX_INPUTLINE); + CL_VM_Parse_Print(cl.csqc_printtextbuf); + cl.csqc_printtextbuf[0] = 0; } else Con_Print(msg); @@ -367,34 +413,121 @@ void CSQC_AddPrintText (const char *msg) void CL_VM_Parse_CenterPrint (const char *msg) { int restorevm_tempstringsbuf_cursize; - if(!csqc_loaded) + if(!cl.csqc_loaded) { - SCR_CenterPrint((char*)msg); + SCR_CenterPrint(msg); return; } CSQC_BEGIN if(prog->funcoffsets.CSQC_Parse_CenterPrint) { prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(msg); PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Parse_CenterPrint, "QC function CSQC_Parse_CenterPrint is missing"); vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } else - SCR_CenterPrint((char*)msg); + SCR_CenterPrint(msg); CSQC_END } +void CL_VM_UpdateIntermissionState (int intermission) +{ + prvm_eval_t *val; + if(cl.csqc_loaded) + { + CSQC_BEGIN + val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.intermission); + if(val) + val->_float = intermission; + CSQC_END + } +} +void CL_VM_UpdateShowingScoresState (int showingscores) +{ + prvm_eval_t *val; + if(cl.csqc_loaded) + { + CSQC_BEGIN + val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.sb_showscores); + if(val) + val->_float = showingscores; + CSQC_END + } +} +qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos) +{ + qboolean r = false; + if(cl.csqc_loaded) + { + CSQC_BEGIN + if(prog->funcoffsets.CSQC_Event_Sound) + { + prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; + PRVM_G_FLOAT(OFS_PARM0) = ent; + PRVM_G_FLOAT(OFS_PARM1) = channel; + PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(cl.sound_name[sound_num] ); + PRVM_G_FLOAT(OFS_PARM3) = volume; + PRVM_G_FLOAT(OFS_PARM4) = attenuation; + VectorCopy(pos, PRVM_G_VECTOR(OFS_PARM5) ); + PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Event_Sound, "QC function CSQC_Event_Sound is missing"); + r = CSQC_RETURNVAL; + } + CSQC_END + } + + return r; +} +void CL_VM_UpdateCoopDeathmatchGlobals (int gametype) +{ + // Avoid global names for clean(er) coding + int localcoop; + int localdeathmatch; + + prvm_eval_t *val; + if(cl.csqc_loaded) + { + if(gametype == GAME_COOP) + { + localcoop = 1; + localdeathmatch = 0; + } + else + if(gametype == GAME_DEATHMATCH) + { + localcoop = 0; + localdeathmatch = 1; + } + else + { + // How did the ServerInfo send an unknown gametype? + // Better just assign the globals as 0... + localcoop = 0; + localdeathmatch = 0; + } + CSQC_BEGIN + val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.coop); + if(val) + val->_float = localcoop; + val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.deathmatch); + if(val) + val->_float = localdeathmatch; + CSQC_END + } +} float CL_VM_Event (float event) //[515]: needed ? I'd say "YES", but don't know for what :D { float r = 0; - if(!csqc_loaded) + if(!cl.csqc_loaded) return 0; CSQC_BEGIN if(prog->funcoffsets.CSQC_Event) { prog->globals.client->time = cl.time; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[cl.playerentity]; PRVM_G_FLOAT(OFS_PARM0) = event; PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Event, "QC function CSQC_Event is missing"); r = CSQC_RETURNVAL; @@ -406,39 +539,60 @@ float CL_VM_Event (float event) //[515]: needed ? I'd say "YES", but don't know void CSQC_ReadEntities (void) { unsigned short entnum, oldself, realentnum; + if(!cl.csqc_loaded) + { + Host_Error ("CSQC_ReadEntities: CSQC is not loaded"); + return; + } + CSQC_BEGIN prog->globals.client->time = cl.time; oldself = prog->globals.client->self; while(1) { entnum = MSG_ReadShort(); - if(!entnum) + if(!entnum || msg_badread) return; realentnum = entnum & 0x7FFF; - prog->globals.client->self = csqc_sv2csqcents[realentnum]; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum]; if(entnum & 0x8000) { if(prog->globals.client->self) { PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Remove, "QC function CSQC_Ent_Remove is missing"); - csqc_sv2csqcents[realentnum] = 0; + cl.csqc_server2csqcentitynumber[realentnum] = 0; } else - Con_Printf("Smth bad happens in csqc...\n"); //[515]: never happens ? + Con_Printf("Bad csqc_server2csqcentitynumber map\n"); //[515]: never happens ? } else { if(!prog->globals.client->self) { - prvm_edict_t *ed; - ed = PRVM_ED_Alloc(); - ed->fields.client->entnum = realentnum; - prog->globals.client->self = csqc_sv2csqcents[realentnum] = PRVM_EDICT_TO_PROG(ed); + if(!prog->funcoffsets.CSQC_Ent_Spawn) + { + prvm_edict_t *ed; + ed = PRVM_ED_Alloc(); + ed->fields.client->entnum = realentnum; + prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT_TO_PROG(ed); + } + else + { + // entity( float entnum ) CSQC_Ent_Spawn; + // the qc function should set entnum, too (this way it also can return world [2/1/2008 Andreas] + PRVM_G_FLOAT(OFS_PARM0) = (float) realentnum; + // make sure no one gets wrong ideas + prog->globals.client->self = 0; + PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Spawn, "QC function CSQC_Ent_Spawn is missing"); + prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT( PRVM_G_INT( OFS_RETURN ) ); + } PRVM_G_FLOAT(OFS_PARM0) = 1; + PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Update, "QC function CSQC_Ent_Update is missing"); } - else + else { PRVM_G_FLOAT(OFS_PARM0) = 0; - PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Update, "QC function CSQC_Ent_Update is missing"); + PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Update, "QC function CSQC_Ent_Update is missing"); + } } } prog->globals.client->self = oldself; @@ -447,17 +601,8 @@ void CSQC_ReadEntities (void) void CL_VM_CB_BeginIncreaseEdicts(void) { - int i; - prvm_edict_t *ent; - // links don't survive the transition, so unlink everything - for (i = 0, ent = prog->edicts;i < prog->max_edicts;i++, ent++) - { - if (!ent->priv.server->free) - World_UnlinkEdict(prog->edicts + i); - memset(&ent->priv.server->areagrid, 0, sizeof(ent->priv.server->areagrid)); - } - World_Clear(&cl.world); + World_UnlinkAll(&cl.world); } void CL_VM_CB_EndIncreaseEdicts(void) @@ -515,10 +660,12 @@ void Cmd_ClearCsqcFuncs (void); void CL_VM_Init (void) { + const char* csprogsfn; unsigned char *csprogsdata; fs_offset_t csprogsdatasize; int csprogsdatacrc, requiredcrc; int requiredsize; + prvm_eval_t *val; // reset csqc_progcrc after reading it, so that changing servers doesn't // expect csqc on the next server @@ -527,19 +674,19 @@ void CL_VM_Init (void) Cvar_SetValueQuick(&csqc_progcrc, -1); Cvar_SetValueQuick(&csqc_progsize, -1); - csqc_loaded = false; - memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache)); - memset(&cl.csqc_vidvars, true, sizeof(csqc_vidvars_t)); - // if the server is not requesting a csprogs, then we're done here if (requiredcrc < 0) return; // see if the requested csprogs.dat file matches the requested crc csprogsdatacrc = -1; - csprogsdata = FS_LoadFile(va("dlcache/%s.%i.%i", csqc_progname.string, requiredsize, requiredcrc), tempmempool, true, &csprogsdatasize); + csprogsfn = va("dlcache/%s.%i.%i", csqc_progname.string, requiredsize, requiredcrc); + csprogsdata = FS_LoadFile(csprogsfn, tempmempool, true, &csprogsdatasize); if (!csprogsdata) - csprogsdata = FS_LoadFile(csqc_progname.string, tempmempool, true, &csprogsdatasize); + { + csprogsfn = csqc_progname.string; + csprogsdata = FS_LoadFile(csprogsfn, tempmempool, true, &csprogsdatasize); + } if (csprogsdata) { csprogsdatacrc = CRC_Block(csprogsdata, csprogsdatasize); @@ -575,8 +722,6 @@ void CL_VM_Init (void) PRVM_Begin; PRVM_InitProg(PRVM_CLIENTPROG); - csqc_mempool = Mem_AllocPool("CSQC", 0, NULL); - // allocate the mempools prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL); prog->headercrc = CL_PROGHEADER_CRC; @@ -587,6 +732,7 @@ void CL_VM_Init (void) prog->limit_edicts = CL_MAX_EDICTS; prog->reserved_edicts = 0; prog->edictprivate_size = sizeof(edict_engineprivate_t); + // TODO: add a shared extension string #define and add real support for csqc extension strings [12/5/2007 Black] prog->extensionstring = vm_sv_extensions; prog->builtins = vm_cl_builtins; prog->numbuiltins = vm_cl_numbuiltins; @@ -600,59 +746,47 @@ void CL_VM_Init (void) prog->reset_cmd = VM_CL_Cmd_Reset; prog->error_cmd = CL_VM_Error; - PRVM_LoadProgs(csqc_progname.string, cl_numrequiredfunc, cl_required_func, 0, NULL, 0, NULL); + PRVM_LoadProgs(csprogsfn, cl_numrequiredfunc, cl_required_func, 0, NULL, 0, NULL); if (!prog->loaded) { - CL_VM_Error("CSQC ^2failed to load\n"); + CL_VM_Error("CSQC %s ^2failed to load\n", csprogsfn); if(!sv.active) CL_Disconnect(); return; } - Con_Printf("CSQC ^5loaded (crc=%i, size=%i)\n", csprogsdatacrc, (int)csprogsdatasize); + Con_Printf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize); // check if OP_STATE animation is possible in this dat file if (prog->fieldoffsets.nextthink >= 0 && prog->fieldoffsets.frame >= 0 && prog->fieldoffsets.think >= 0 && prog->globaloffsets.self >= 0) prog->flag |= PRVM_OP_STATE; - //[515]: optional fields & funcs - if(prog->funcoffsets.CSQC_Parse_Print) - { - csqc_printtextbuf = (char *)Mem_Alloc(csqc_mempool, MAX_INPUTLINE); - csqc_printtextbuf[0] = 0; - } - - if (cl.worldmodel) - { - VectorCopy(cl.worldmodel->normalmins, cl.world.areagrid_mins); - VectorCopy(cl.worldmodel->normalmaxs, cl.world.areagrid_maxs); - } - else - { - VectorSet(cl.world.areagrid_mins, -4096, -4096, -4096); - VectorSet(cl.world.areagrid_maxs, 4096, 4096, 4096); - } - World_Clear(&cl.world); - // set time prog->globals.client->time = cl.time; - csqc_frametime = 0; + prog->globals.client->self = 0; - prog->globals.client->mapname = PRVM_SetEngineString(cl.worldmodel->name); + prog->globals.client->mapname = cl.worldmodel ? PRVM_SetEngineString(cl.worldmodel->name) : PRVM_SetEngineString(""); prog->globals.client->player_localentnum = cl.playerentity; + // set map description (use world entity 0) + val = PRVM_EDICTFIELDVALUE(prog->edicts, prog->fieldoffsets.message); + if(val) + val->string = PRVM_SetEngineString(cl.levelname); + VectorCopy(cl.world.mins, prog->edicts->fields.client->mins); + VectorCopy(cl.world.maxs, prog->edicts->fields.client->maxs); + // call the prog init PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Init, "QC function CSQC_Init is missing"); PRVM_End; - csqc_loaded = true; - - csqc_sv2csqcents = (unsigned short *)Mem_Alloc(csqc_mempool, MAX_EDICTS*sizeof(unsigned short)); - memset(csqc_sv2csqcents, 0, MAX_EDICTS*sizeof(unsigned short)); + cl.csqc_loaded = true; cl.csqc_vidvars.drawcrosshair = false; cl.csqc_vidvars.drawenginesbar = false; + + // Update Coop and Deathmatch Globals (at this point the client knows them from ServerInfo) + CL_VM_UpdateCoopDeathmatchGlobals(cl.gametype); } void CL_VM_ShutDown (void) @@ -660,14 +794,15 @@ void CL_VM_ShutDown (void) Cmd_ClearCsqcFuncs(); Cvar_SetValueQuick(&csqc_progcrc, -1); Cvar_SetValueQuick(&csqc_progsize, -1); - if(!csqc_loaded) + if(!cl.csqc_loaded) return; CSQC_BEGIN prog->globals.client->time = cl.time; - PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Shutdown, "QC function CSQC_Shutdown is missing"); + prog->globals.client->self = 0; + if (prog->funcoffsets.CSQC_Shutdown) + PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Shutdown, "QC function CSQC_Shutdown is missing"); PRVM_ResetProg(); CSQC_END Con_Print("CSQC ^1unloaded\n"); - csqc_loaded = false; - Mem_FreePool(&csqc_mempool); + cl.csqc_loaded = false; }