From ef5bdc66d33164809f81bde73a31c818a2032457 Mon Sep 17 00:00:00 2001
From: blackwc <blackwc88@gmail.com>
Date: Sun, 11 Oct 2015 02:34:21 -0400
Subject: [PATCH] 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);