diff -r d7bef04c99d4 -r 274afc318dca hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Fri Jan 04 02:58:19 2013 +0100 +++ b/hedgewars/uVariables.pas Fri Jan 04 03:13:21 2013 +0100 @@ -2326,12 +2326,13 @@ begin // initialisation flags - they are going to be overwritten by program args - cScreenWidth := 1024; - cScreenHeight := 768; - cFullscreenWidth := 1024; - cFullscreenHeight := 768; + cFullscreenWidth := 0; + cFullscreenHeight := 0; cWindowedWidth := 1024; cWindowedHeight := 768; + cScreenWidth := cWindowedWidth; + cScreenHeight := cWindowedHeight; + cShowFPS := false; cAltDamage := true; cTimerInterval := 8; @@ -2512,13 +2513,20 @@ vobSDVelocity:= 15; vobSDFallSpeed:= 250; - cMinScreenWidth:= min(cScreenWidth, 640); - cMinScreenHeight:= min(cScreenHeight, 480); + cMinScreenWidth := min(cScreenWidth, 640); + cMinScreenHeight := min(cScreenHeight, 480); cNewScreenWidth := cScreenWidth; cNewScreenHeight := cScreenHeight; cScreenResizeDelay := 0; + // make sure fullscreen resolution is always initialised somehow + if cFullscreenWidth = 0 then + cFullscreenWidth:= min(cWindowedWidth, 640); + if cFullscreenHeight = 0 then + cFullscreenHeight:= min(cWindowedHeight, 480); + + LuaGoals:= ''; cMapName:= '';