From 6d6055c8738c96bc5910ba9be720c2ac0e2abdeb Mon Sep 17 00:00:00 2001 From: blackwc Date: Wed, 7 Oct 2015 03:28:48 -0400 Subject: [PATCH 1/3] fullscreen and windowed mode cli fix --- Templates/Empty/game/core/main.cs | 4 ++-- Templates/Empty/game/core/scripts/client/canvas.cs | 3 +++ Templates/Full/game/core/main.cs | 4 ++-- Templates/Full/game/core/scripts/client/canvas.cs | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Templates/Empty/game/core/main.cs b/Templates/Empty/game/core/main.cs index 0baeb9364..f666c948c 100644 --- a/Templates/Empty/game/core/main.cs +++ b/Templates/Empty/game/core/main.cs @@ -141,11 +141,11 @@ function parseArgs() switch$ (%arg) { case "-fullscreen": - setFullScreen(true); + $cliFullscreen = true; $argUsed[%i]++; case "-windowed": - setFullScreen(false); + $cliFullscreen = false; $argUsed[%i]++; case "-openGL": diff --git a/Templates/Empty/game/core/scripts/client/canvas.cs b/Templates/Empty/game/core/scripts/client/canvas.cs index 69dd6da71..b3a906f46 100644 --- a/Templates/Empty/game/core/scripts/client/canvas.cs +++ b/Templates/Empty/game/core/scripts/client/canvas.cs @@ -32,6 +32,9 @@ function configureCanvas() if ($pref::Video::mode $= "") $pref::Video::mode = "800 600 false 32 60 0"; + if($cliFullscreen !$="") + $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen); + %resX = getWord($pref::Video::mode, $WORD::RES_X); %resY = getWord($pref::Video::mode, $WORD::RES_Y); %fs = getWord($pref::Video::mode, $WORD::FULLSCREEN); diff --git a/Templates/Full/game/core/main.cs b/Templates/Full/game/core/main.cs index 0baeb9364..f666c948c 100644 --- a/Templates/Full/game/core/main.cs +++ b/Templates/Full/game/core/main.cs @@ -141,11 +141,11 @@ function parseArgs() switch$ (%arg) { case "-fullscreen": - setFullScreen(true); + $cliFullscreen = true; $argUsed[%i]++; case "-windowed": - setFullScreen(false); + $cliFullscreen = false; $argUsed[%i]++; case "-openGL": diff --git a/Templates/Full/game/core/scripts/client/canvas.cs b/Templates/Full/game/core/scripts/client/canvas.cs index 69dd6da71..b3a906f46 100644 --- a/Templates/Full/game/core/scripts/client/canvas.cs +++ b/Templates/Full/game/core/scripts/client/canvas.cs @@ -32,6 +32,9 @@ function configureCanvas() if ($pref::Video::mode $= "") $pref::Video::mode = "800 600 false 32 60 0"; + if($cliFullscreen !$="") + $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen); + %resX = getWord($pref::Video::mode, $WORD::RES_X); %resY = getWord($pref::Video::mode, $WORD::RES_Y); %fs = getWord($pref::Video::mode, $WORD::FULLSCREEN); From 5239c2f183787e66393391a9b1d6016d29f8dd65 Mon Sep 17 00:00:00 2001 From: blackwc Date: Wed, 7 Oct 2015 04:56:36 -0400 Subject: [PATCH 2/3] fullscreen and windowed mode cli fix update --- Templates/Empty/game/core/scripts/client/canvas.cs | 4 +++- Templates/Full/game/core/scripts/client/canvas.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Templates/Empty/game/core/scripts/client/canvas.cs b/Templates/Empty/game/core/scripts/client/canvas.cs index b3a906f46..3982b433d 100644 --- a/Templates/Empty/game/core/scripts/client/canvas.cs +++ b/Templates/Empty/game/core/scripts/client/canvas.cs @@ -32,8 +32,10 @@ function configureCanvas() if ($pref::Video::mode $= "") $pref::Video::mode = "800 600 false 32 60 0"; - if($cliFullscreen !$="") + if($cliFullscreen !$="") { $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen); + $cliFullscreen = ""; + } %resX = getWord($pref::Video::mode, $WORD::RES_X); %resY = getWord($pref::Video::mode, $WORD::RES_Y); diff --git a/Templates/Full/game/core/scripts/client/canvas.cs b/Templates/Full/game/core/scripts/client/canvas.cs index b3a906f46..cae9e16b6 100644 --- a/Templates/Full/game/core/scripts/client/canvas.cs +++ b/Templates/Full/game/core/scripts/client/canvas.cs @@ -32,8 +32,10 @@ function configureCanvas() if ($pref::Video::mode $= "") $pref::Video::mode = "800 600 false 32 60 0"; - if($cliFullscreen !$="") + if($cliFullscreen !$= "") { $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen); + $cliFullscreen = ""; + } %resX = getWord($pref::Video::mode, $WORD::RES_X); %resY = getWord($pref::Video::mode, $WORD::RES_Y); From ef5bdc66d33164809f81bde73a31c818a2032457 Mon Sep 17 00:00:00 2001 From: blackwc Date: Sun, 11 Oct 2015 02:34:21 -0400 Subject: [PATCH 3/3] fullscreen and windowed mode cli fix update 2 --- Templates/Empty/game/core/scripts/client/canvas.cs | 14 +++++++------- Templates/Full/game/core/scripts/client/canvas.cs | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Templates/Empty/game/core/scripts/client/canvas.cs b/Templates/Empty/game/core/scripts/client/canvas.cs index 3982b433d..5c1d377c5 100644 --- a/Templates/Empty/game/core/scripts/client/canvas.cs +++ b/Templates/Empty/game/core/scripts/client/canvas.cs @@ -32,11 +32,6 @@ function configureCanvas() if ($pref::Video::mode $= "") $pref::Video::mode = "800 600 false 32 60 0"; - if($cliFullscreen !$="") { - $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen); - $cliFullscreen = ""; - } - %resX = getWord($pref::Video::mode, $WORD::RES_X); %resY = getWord($pref::Video::mode, $WORD::RES_Y); %fs = getWord($pref::Video::mode, $WORD::FULLSCREEN); @@ -44,9 +39,14 @@ function configureCanvas() %rate = getWord($pref::Video::mode, $WORD::REFRESH); %fsaa = getWord($pref::Video::mode, $WORD::AA); - echo("--------------"); - echo("Attempting to set resolution to \"" @ $pref::Video::mode @ "\""); + if($cliFullscreen !$= "") { + %fs = $cliFullscreen; + $cliFullscreen = ""; + } + echo("--------------"); + echo("Attempting to set resolution to \"" @ %resX SPC %resY SPC %fs SPC %bpp SPC %rate SPC %fsaa @ "\""); + %deskRes = getDesktopResolution(); %deskResX = getWord(%deskRes, $WORD::RES_X); %deskResY = getWord(%deskRes, $WORD::RES_Y); diff --git a/Templates/Full/game/core/scripts/client/canvas.cs b/Templates/Full/game/core/scripts/client/canvas.cs index cae9e16b6..5c1d377c5 100644 --- a/Templates/Full/game/core/scripts/client/canvas.cs +++ b/Templates/Full/game/core/scripts/client/canvas.cs @@ -32,11 +32,6 @@ function configureCanvas() if ($pref::Video::mode $= "") $pref::Video::mode = "800 600 false 32 60 0"; - if($cliFullscreen !$= "") { - $pref::Video::mode = setWord($pref::Video::mode, $WORD::FULLSCREEN, $cliFullScreen); - $cliFullscreen = ""; - } - %resX = getWord($pref::Video::mode, $WORD::RES_X); %resY = getWord($pref::Video::mode, $WORD::RES_Y); %fs = getWord($pref::Video::mode, $WORD::FULLSCREEN); @@ -44,9 +39,14 @@ function configureCanvas() %rate = getWord($pref::Video::mode, $WORD::REFRESH); %fsaa = getWord($pref::Video::mode, $WORD::AA); - echo("--------------"); - echo("Attempting to set resolution to \"" @ $pref::Video::mode @ "\""); + if($cliFullscreen !$= "") { + %fs = $cliFullscreen; + $cliFullscreen = ""; + } + echo("--------------"); + echo("Attempting to set resolution to \"" @ %resX SPC %resY SPC %fs SPC %bpp SPC %rate SPC %fsaa @ "\""); + %deskRes = getDesktopResolution(); %deskResX = getWord(%deskRes, $WORD::RES_X); %deskResY = getWord(%deskRes, $WORD::RES_Y);