Skip to content

Commit

Permalink
CGAME: Precache the holo lollies
Browse files Browse the repository at this point in the history
  • Loading branch information
kai-li-wop committed Nov 29, 2024
1 parent b6c27a5 commit 32fb4ab
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions code/cgame/cg_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1033,8 +1033,6 @@ static void CG_RegisterGraphics(void) {
if (cgs.gametype == GT_CTF || cgs.gametype == GT_1FCTF || cg_buildScript.integer) {
cgs.media.hud_CTL_bg_red = trap_R_RegisterShaderNoMip("hud/CTL_red");
cgs.media.hud_CTL_bg_blue = trap_R_RegisterShaderNoMip("hud/CTL_blue");
cgs.media.redFlagModel = trap_R_RegisterModel("models/ctl/lollipop_red");
cgs.media.blueFlagModel = trap_R_RegisterModel("models/ctl/lollipop_blue");
cgs.media.redFlagShader[0] = trap_R_RegisterShaderNoMip("icons/hud_lolly_red1");
cgs.media.blueFlagShader[0] = trap_R_RegisterShaderNoMip("icons/hud_lolly_blue1");
// BamBam assets
Expand All @@ -1052,13 +1050,17 @@ static void CG_RegisterGraphics(void) {
}

if (cgs.gametype == GT_CTF || cg_buildScript.integer) {
cgs.media.redFlagModel = trap_R_RegisterModel("models/ctl/lollipop_red");
cgs.media.blueFlagModel = trap_R_RegisterModel("models/ctl/lollipop_blue");
cgs.media.redFlagShader[1] = trap_R_RegisterShaderNoMip("icons/hud_lolly_red2");
cgs.media.redFlagShader[2] = trap_R_RegisterShaderNoMip("icons/hud_lolly_red3");
cgs.media.blueFlagShader[1] = trap_R_RegisterShaderNoMip("icons/hud_lolly_blue2");
cgs.media.blueFlagShader[2] = trap_R_RegisterShaderNoMip("icons/hud_lolly_blue3");
}

if (cgs.gametype == GT_1FCTF || cg_buildScript.integer) {
cgs.media.redFlagModel = trap_R_RegisterModel("models/ctl/lollipop_red_holo");
cgs.media.blueFlagModel = trap_R_RegisterModel("models/ctl/lollipop_blue_holo");
cgs.media.neutralFlagModel = trap_R_RegisterModel("models/ctl/lollipop_neutral");
cgs.media.neutralflagShader[0] = trap_R_RegisterShaderNoMip("icons/hud_lolly_neutral1");
cgs.media.neutralflagShader[1] = trap_R_RegisterShaderNoMip("icons/hud_lolly_neutral2");
Expand Down

0 comments on commit 32fb4ab

Please sign in to comment.