eukara
/
fteqw
forked from fte/fteqw
1
0
Fork 0
Code Pull Requests Activity

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5304 fc73d0e0-1445-4013-8a0c-d673dee63da5

This commit is contained in:
Spoike 2018-09-01 06:05:51 +00:00
parent 5b7a426afe
commit 36debaea4d
4 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/client/cl_main.c
View File

@ -2063,7 +2063,6 @@ void CL_Color_f (void)
#endif #endif
} }
qboolean CL_CheckDLFile(const char *filename);
void CL_PakDownloads(int mode) void CL_PakDownloads(int mode)
{ {
/* /*

1
engine/client/client.h
View File

@ -1280,6 +1280,7 @@ void CLQ2_ParseServerMessage (void);
void CL_NewTranslation (int slot); void CL_NewTranslation (int slot);
int CL_IsDownloading(const char *localname); int CL_IsDownloading(const char *localname);
qboolean CL_CheckDLFile(const char *filename);
qboolean CL_CheckOrEnqueDownloadFile (const char *filename, const char *localname, unsigned int flags); qboolean CL_CheckOrEnqueDownloadFile (const char *filename, const char *localname, unsigned int flags);
qboolean CL_EnqueDownload(const char *filename, const char *localname, unsigned int flags); qboolean CL_EnqueDownload(const char *filename, const char *localname, unsigned int flags);
downloadlist_t *CL_DownloadFailed(const char *name, qdownload_t *qdl); downloadlist_t *CL_DownloadFailed(const char *name, qdownload_t *qdl);

14
engine/common/pr_bgcmd.c
View File

@ -2925,22 +2925,10 @@ void QCBUILTIN PF_num_for_edict (pubprogfuncs_t *prinst, struct globalvars_s *pr
void QCBUILTIN PF_edict_for_num(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals) void QCBUILTIN PF_edict_for_num(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
{ {
world_t *w = prinst->parms->user; world_t *w = prinst->parms->user;
edict_t *ent;
unsigned int num = G_FLOAT(OFS_PARM0); unsigned int num = G_FLOAT(OFS_PARM0);
if (num >= w->num_edicts) if (num >= w->num_edicts)
RETURN_EDICT(prinst, w->edicts); RETURN_EDICT(prinst, w->edicts);
G_INT(OFS_RETURN) = num; G_INT(OFS_RETURN) = num; //just directly store it. if its not spawned yet we'll need to catch that elsewhere anyway.
/*
ent = (edict_t*)EDICT_NUM_PB(prinst, num);
if (!ent)
{
ent = ED_AllocIntoTable(progfuncs, num, false, prinst.fields_size);
ent->ereftype = ER_FREE;
if (externs->entspawn)
externs->entspawn((struct edict_s *) ent, true);
}
RETURN_EDICT(prinst, ent);*/
} }
/* /*

13
engine/server/sv_user.c
View File

@ -1052,11 +1052,13 @@ void SV_SendClientPrespawnInfo(client_t *client)
int track = 0; int track = 0;
const char *noise = ""; const char *noise = "";
#ifdef HEXEN2
if (progstype == PROG_H2) if (progstype == PROG_H2)
{ {
track = sv.h2cdtrack; //hexen2 has a special hack track = sv.h2cdtrack; //hexen2 has a special hack
} } else
else if (svprogfuncs) #endif
if (svprogfuncs)
{ {
track = ((edict_t*)sv.world.edicts)->v->sounds; track = ((edict_t*)sv.world.edicts)->v->sounds;
noise = PR_GetString(svprogfuncs, ((edict_t*)sv.world.edicts)->v->noise); noise = PR_GetString(svprogfuncs, ((edict_t*)sv.world.edicts)->v->noise);
@ -1070,9 +1072,10 @@ void SV_SendClientPrespawnInfo(client_t *client)
ClientReliableWrite_Byte (client, track); ClientReliableWrite_Byte (client, track);
if (ISNQCLIENT(client)) if (ISNQCLIENT(client))
ClientReliableWrite_Byte (client, track); ClientReliableWrite_Byte (client, track);
#ifdef HEXEN2
if (!track && *sv.h2miditrack) if (!track && *sv.h2miditrack)
SV_StuffcmdToClient(client, va("music \"%s\"\n", sv.h2miditrack)); SV_StuffcmdToClient(client, va("music \"%s\"\n", sv.h2miditrack));
#endif
} }
} }
else if (client->prespawn_idx == 5) else if (client->prespawn_idx == 5)
@ -7597,8 +7600,8 @@ void SV_ReadQCRequest(void)
ed = EDICT_NUM_PB(svprogfuncs, e); ed = EDICT_NUM_PB(svprogfuncs, e);
if (!ed) if (!ed)
{ {
ed = sv.world.edicts; ed = (edict_t*)sv.world.edicts;
Con_Printf("client %s sent invalid entity\n", fromclient->name); Con_Printf("client %s sent invalid entity\n", host_client->name);
host_client->drop = true; host_client->drop = true;
} }
G_INT(OFS_PARM0+i*3) = EDICT_TO_PROG(svprogfuncs, ed); G_INT(OFS_PARM0+i*3) = EDICT_TO_PROG(svprogfuncs, ed);