yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-03-02 15:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

client: cache 8 maps in collision code

Browse source
This commit is contained in:
Denis Pauk 2023-11-05 18:50:02 +02:00
parent 51a8dfb6f3
commit 1270ae66d5
2 changed files with 20 additions and 6 deletions
src
common
collision.c
game
g_ctf.c

16
src/common/collision.c
View file

@ -116,7 +116,7 @@ typedef struct
void *extradata; void *extradata;
} model_t; } model_t;
#define MAX_MOD_KNOWN 4 #define MAX_MOD_KNOWN 8
static model_t models[MAX_MOD_KNOWN]; static model_t models[MAX_MOD_KNOWN];
static int model_num = 0; static int model_num = 0;
@ -2089,7 +2089,7 @@ CM_LoadCachedMap(const char *name, model_t *mod)
cmodel_t * cmodel_t *
CM_LoadMap(const char *name, qboolean clientload, unsigned *checksum) CM_LoadMap(const char *name, qboolean clientload, unsigned *checksum)
{ {
int i; int i, sec_start;
map_noareas = Cvar_Get("map_noareas", "0", 0); map_noareas = Cvar_Get("map_noareas", "0", 0);
@ -2114,6 +2114,7 @@ CM_LoadMap(const char *name, qboolean clientload, unsigned *checksum)
return &cmod->map_cmodels[0]; /* still have the right version */ return &cmod->map_cmodels[0]; /* still have the right version */
} }
sec_start = Sys_Milliseconds();
cmod = NULL; cmod = NULL;
/* search already loaded */ /* search already loaded */
for (i = 0; i < MAX_MOD_KNOWN; i++) for (i = 0; i < MAX_MOD_KNOWN; i++)
@ -2122,8 +2123,8 @@ CM_LoadMap(const char *name, qboolean clientload, unsigned *checksum)
{ {
model_num = i; model_num = i;
cmod = &models[model_num]; cmod = &models[model_num];
Com_DPrintf("%s: Loaded cached map: %s\n", Com_DPrintf("%s: Loaded cached map: %s: %d Kb\n",
__func__, name); __func__, name, cmod->extradatasize / 1024);
break; break;
} }
} }
@ -2149,10 +2150,10 @@ CM_LoadMap(const char *name, qboolean clientload, unsigned *checksum)
{ {
model_num = (model_num + 1) % MAX_MOD_KNOWN; model_num = (model_num + 1) % MAX_MOD_KNOWN;
cmod = &models[model_num]; cmod = &models[model_num];
Com_DPrintf("%s: No free space. Clean up random for map: %s: %d Kb\n",
__func__, name, cmod->extradatasize / 1024);
/* free old stuff */ /* free old stuff */
CM_ModFree(cmod); CM_ModFree(cmod);
Com_DPrintf("%s: No free space. Clean up random for map: %s\n",
__func__, name);
} }
/* need to load map */ /* need to load map */
@ -2168,6 +2169,9 @@ CM_LoadMap(const char *name, qboolean clientload, unsigned *checksum)
memset(cmod->portalopen, 0, sizeof(qboolean) * cmod->numareaportals); memset(cmod->portalopen, 0, sizeof(qboolean) * cmod->numareaportals);
FloodAreaConnections(); FloodAreaConnections();
Com_DPrintf("%s: Loaded map: %s: %d Kb in %.2fs\n",
__func__, name, cmod->extradatasize / 1024,
(Sys_Milliseconds() - sec_start) / 1000.0);
return cmod->map_cmodels; return cmod->map_cmodels;
} }

10
src/game/g_ctf.c
View file

@ -857,6 +857,11 @@ CTFCheckHurtCarrier(edict_t *targ, edict_t *attacker)
return; return;
} }
if (!flag1_item || !flag2_item)
{
return;
}
if (targ->client->resp.ctf_team == CTF_TEAM1) if (targ->client->resp.ctf_team == CTF_TEAM1)
{ {
flag_item = flag2_item; flag_item = flag2_item;
@ -1117,6 +1122,11 @@ CTFDeadDropFlag(edict_t *self)
{ {
edict_t *dropped = NULL; edict_t *dropped = NULL;
if (!flag1_item || !flag2_item)
{
return;
}
if (self->client->pers.inventory[ITEM_INDEX(flag1_item)]) if (self->client->pers.inventory[ITEM_INDEX(flag1_item)])
{ {
dropped = Drop_Item(self, flag1_item); dropped = Drop_Item(self, flag1_item);