Hello,
I was thinking about chagning the font Warzone uses (why DejaVu Sans _Mono_?),
and noticed that 2.2 beta1 still used the 2.1 config dir. Beta2 will use a new
one, so everyone will get its default configuration.
The changes I'd like to see are:
- Change the font to DejaVu Sans: monospaced fonts are quite ugly imo, and
there's no need for it, OSX even uses a proportional font already.
- Play videos fullscreen: Options for smaller display exist, and with the
nearest neighbour filtering it uses now the only blur is what is in the
videos itself.
- Coloured cursors on: Comments in the code say it has a performance hit, but
there's a config option to disable them (and shadows also have a cost and are
enabled by default).
- Disable pause on focus loss: If you want to pause, you can always press
escape to pull up the menu, and it's annoying as default.
Per also wanted to disable the rotating radar. It doesn't bother me much, but I
agree that it's somewhat strange.
I've attached a patch that changes those defaults. The font change needs an
updated dev package with the DejaVu Sans and Sans Bold fonts included. Since
OSX apparently doesn't support monochrome cursors, I've made the menu option
unchangeable for it.
OK to apply? Comments, or other defaults that we might want to change for 2.2?
pkg/nsis/warzone2100.nsi | 4 ++--
src/configuration.c | 18 ++++++------------
src/frontend.c | 3 +++
src/warzoneconfig.c | 10 ++--------
4 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/pkg/nsis/warzone2100.nsi b/pkg/nsis/warzone2100.nsi
index e59ee31..0aa8a21 100644
--- a/pkg/nsis/warzone2100.nsi
+++ b/pkg/nsis/warzone2100.nsi
@@ -172,8 +172,8 @@ Section $(TEXT_SecBase) SecBase
SetOutPath "$INSTDIR\fonts"
File "${EXTDIR}\etc\fonts\fonts.conf"
- File "${EXTDIR}\etc\fonts\DejaVuSansMono.ttf"
- File "${EXTDIR}\etc\fonts\DejaVuSansMono-Bold.ttf"
+ File "${EXTDIR}\etc\fonts\DejaVuSans.ttf"
+ File "${EXTDIR}\etc\fonts\DejaVuSans-Bold.ttf"
;Store installation folder
WriteRegStr HKLM "Software\${PACKAGE_NAME}" "" $INSTDIR
diff --git a/src/configuration.c b/src/configuration.c
index 60d1736..dd40b73 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -250,7 +250,7 @@ BOOL loadConfig(void)
}
else
{
- rotateRadar = true;
+ rotateRadar = false;
setWarzoneKeyNumeric("rotateRadar", rotateRadar);
}
@@ -260,8 +260,8 @@ BOOL loadConfig(void)
}
else
{
- war_SetPauseOnFocusLoss(true);
- setWarzoneKeyNumeric("PauseOnFocusLoss", true);
+ war_SetPauseOnFocusLoss(false);
+ setWarzoneKeyNumeric("PauseOnFocusLoss", false);
}
if (getWarzoneKeyString("masterserver_name", sBuf))
@@ -284,8 +284,8 @@ BOOL loadConfig(void)
iV_font("Lucida Grande", NULL, NULL);
setWarzoneKeyString("fontname", "Lucida Grande");
#else
- iV_font("DejaVu Sans Mono", NULL, NULL);
- setWarzoneKeyString("fontname", "DejaVu Sans Mono");
+ iV_font("DejaVu Sans", NULL, NULL);
+ setWarzoneKeyString("fontname", "DejaVu Sans");
#endif
}
@@ -342,7 +342,7 @@ BOOL loadConfig(void)
}
else
{
- war_SetFMVmode(FMV_2X);
+ war_SetFMVmode(FMV_FULLSCREEN);
}
// //////////////////////////
@@ -603,14 +603,8 @@ BOOL loadRenderMode(void)
}
else
{
-#ifdef WZ_OS_MAC
- // Mac OS X doesn't support normal cursors
war_SetColouredCursor(true);
setWarzoneKeyNumeric("ColouredCursor", true);
-#else
- war_SetColouredCursor(false);
- setWarzoneKeyNumeric("ColouredCursor", false);
-#endif
}
if (getWarzoneKeyNumeric("trapCursor", &val))
diff --git a/src/frontend.c b/src/frontend.c
index bb25191..ff3c30e 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -1185,8 +1185,11 @@ BOOL runGameOptions5Menu(void)
case FRONTEND_CURSORMODE_R:
if (war_GetColouredCursor())
{
+// Mac OS X doesn't support normal cursors
+#ifndef WZ_OS_MAC
war_SetColouredCursor(false);
widgSetString(psWScreen, FRONTEND_CURSORMODE_R, _("Hardware"));
+#endif
}
else
{
diff --git a/src/warzoneconfig.c b/src/warzoneconfig.c
index 8732e4b..368f196 100644
--- a/src/warzoneconfig.c
+++ b/src/warzoneconfig.c
@@ -82,14 +82,8 @@ void war_SetDefaultStates(void)//Sets all states
//set those here and reset in clParse or loadConfig
war_SetFog(false);
war_setSoundEnabled( true );
- war_SetPauseOnFocusLoss(true);
-#ifdef WZ_OS_MAC
- war_SetColouredCursor(true); // Mac OS X doesn't support uncolored cursors
-#else
- // Colored cursors aren't enabled by default for other OSes
- // because they carry a performance penalty
- war_SetColouredCursor(false);
-#endif
+ war_SetPauseOnFocusLoss(false);
+ war_SetColouredCursor(true);
war_SetMusicEnabled(true);
}
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
