From a80f9c88e79d15d4b83dee84cf36f044b5b45ada Mon Sep 17 00:00:00 2001 From: Bukz Date: Sun, 17 Mar 2013 17:21:04 +0000 Subject: [PATCH] hardcoded __fontsetting git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7361 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/defaults.cfg | 1 - config/menus_settings.cfg | 3 --- source/src/rendertext.cpp | 9 +++++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config/defaults.cfg b/config/defaults.cfg index 513b3ccc..061eb086 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -18,7 +18,6 @@ gfxqualityalias = 3 // Default GFX is medium. soundqualityalias = 3 // Default sound is best. poniesmodeon = 0 // Reduced violence mode. __gibsgore = 1 // Default value for gibs slider. -__fontsetting = 0 dyngamma = 0 old_editbinds = 1 nickhighlight = 0 diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 05cb4ee0..06f8aa83 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -445,9 +445,6 @@ menuitem [Weapon settings...] [ showmenu [Weapo menuitem [Edit kill messages...] [ showmenu [Kill Messages] ] menuitem [Bot settings...] [ showmenu [Bot settings] ] -persistidents 1 -__fontsetting = 0 // Initial setting for status of fonts so AC doesn't give errors. -persistidents 0 __screenshottype = 0 // Initial setting for status of screenshots so AC doesn't give errors. newmenu Misc diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp index 8046f994..0ed23af1 100644 --- a/source/src/rendertext.cpp +++ b/source/src/rendertext.cpp @@ -10,6 +10,7 @@ static font *fontdef = NULL; font *curfont = NULL; VARP(allowblinkingtext, 0, 0, 1); // if you're so inclined +VARP(__fontsetting, 0, 0, 2); void newfont(char *name, char *tex, int *defaultw, int *defaulth, int *offsetx, int *offsety, int *offsetw, int *offseth) { @@ -68,6 +69,14 @@ bool setfont(const char *name) { font *f = fonts.access(name); if(!f) return false; + int v = -1; + if(strcmp(name, "default")==0) + v = 0; + else if(strcmp(name, "serif")==0) + v = 1; + else if(strcmp(name, "mono")==0) + v = 2; + if(v!=-1) __fontsetting = v; curfont = f; return true; }