Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Register BigFont #1221

Closed
wants to merge 1 commit into from
Closed

Register BigFont #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/cgame/cg_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2115,7 +2115,8 @@ void CG_Init( int serverCommandSequence ) {
cgs.media.charsetShader = cgi_R_RegisterShaderNoMip("gfx/2d/charsgrid_med");

cgs.media.qhFontSmall = cgi_R_RegisterFont("ocr_a");
cgs.media.qhFontMedium= cgi_R_RegisterFont("ergoec");
cgs.media.qhFontMedium = cgi_R_RegisterFont("ergoec");
cgs.media.qhFontBig = cgi_R_RegisterFont("arialnb");

cgs.media.whiteShader = cgi_R_RegisterShader( "white" );
cgs.media.loadTick = cgi_R_RegisterShaderNoMip( "gfx/hud/load_tick" );
Expand Down
1 change: 1 addition & 0 deletions code/cgame/cg_media.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ typedef struct {
//
qhandle_t qhFontSmall;
qhandle_t qhFontMedium;
qhandle_t qhFontBig;

// special effects models / etc.
qhandle_t personalShieldShader;
Expand Down
3 changes: 2 additions & 1 deletion codeJK2/cgame/cg_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,8 @@ void CG_Init( int serverCommandSequence ) {
cgs.media.charsetShader = cgi_R_RegisterShaderNoMip("gfx/2d/charsgrid_med");

cgs.media.qhFontSmall = cgi_R_RegisterFont("ocr_a");
cgs.media.qhFontMedium= cgi_R_RegisterFont("ergoec");
cgs.media.qhFontMedium = cgi_R_RegisterFont("ergoec");
cgs.media.qhFontBig = cgi_R_RegisterFont("arialnb");

cgs.media.whiteShader = cgi_R_RegisterShader( "white" );
cgs.media.loadTick = cgi_R_RegisterShaderNoMip( "gfx/hud/load_tick" );
Expand Down
1 change: 1 addition & 0 deletions codeJK2/cgame/cg_media.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ typedef struct {
//
qhandle_t qhFontSmall;
qhandle_t qhFontMedium;
qhandle_t qhFontBig;

// special effects models / etc.
qhandle_t personalShieldShader;
Expand Down
3 changes: 1 addition & 2 deletions codemp/cgame/cg_draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ int MenuFontToHandle(int iMenuFont)
case FONT_SMALL: return cgDC.Assets.qhSmallFont;
case FONT_SMALL2: return cgDC.Assets.qhSmall2Font;
case FONT_MEDIUM: return cgDC.Assets.qhMediumFont;
case FONT_LARGE: return cgDC.Assets.qhMediumFont;//cgDC.Assets.qhBigFont;
//fixme? Big fonr isn't registered...?
case FONT_LARGE: return cgDC.Assets.qhBigFont;
}

return cgDC.Assets.qhMediumFont;
Expand Down
2 changes: 1 addition & 1 deletion codemp/cgame/cg_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2447,7 +2447,7 @@ Ghoul2 Insert End
// CG_LoadFonts();
cgDC.Assets.qhSmallFont = trap->R_RegisterFont("ocr_a");
cgDC.Assets.qhMediumFont = trap->R_RegisterFont("ergoec");
cgDC.Assets.qhBigFont = cgDC.Assets.qhMediumFont;
cgDC.Assets.qhBigFont = trap->R_RegisterFont("arialnb");

memset( &cgs, 0, sizeof( cgs ) );
memset( cg_weapons, 0, sizeof(cg_weapons) );
Expand Down
Loading