Merge pull request #1453 from blackwc/playJournal-template-fix

playJournal fix and removed depcrecated command line options

Templates/Empty/game/core/parseArgs.cs

@@ -160,7 +160,7 @@ function defaultParseArgs()
             $argUsed[$i]++;
             if ($hasNextArg)
             {
-               playJournal($nextArg,false);
+               playJournal($nextArg);
                $argUsed[$i+1]++;
                $i++;
             }
@@ -240,18 +240,6 @@ function defaultParseArgs()
             else
                error("Error: Missing Command Line argument. Usage: -vidCapHeight <ouput_video_height>");
 
-         //--------------------
-         case "-jDebug":
-            $argUsed[$i]++;
-            if ($hasNextArg)
-            {
-               playJournal($nextArg,true);
-               $argUsed[$i+1]++;
-               $i++;
-            }
-            else
-               error("Error: Missing Command Line argument. Usage: -jDebug <journal_name>");
-
          //--------------------
          case "-level":
             $argUsed[$i]++;

Templates/Empty/game/main.cs

@@ -57,7 +57,7 @@ $displayHelp = false;
 
 // Use these to record and play back crashes
 //saveJournal("editorOnFileQuitCrash.jrn");
-//playJournal("editorOnFileQuitCrash.jrn", false);
+//playJournal("editorOnFileQuitCrash.jrn");
 
 //------------------------------------------------------------------------------
 // Check if a script file exists, compiled or not.
@@ -186,10 +186,8 @@ function displayHelp() {
       "  <game_name>            Works like the -game argument\n"@
       "  -dir <dir_name>        Add <dir_name> to list of directories\n"@
       "  -console               Open a separate console\n"@
-      "  -show <shape>          Deprecated\n"@
       "  -jSave  <file_name>    Record a journal\n"@
       "  -jPlay  <file_name>    Play back a journal\n"@
-      "  -jDebug <file_name>    Play back a journal and issue an int3 at the end\n"@
       "  -help                  Display this help message\n"
    );
 }

Templates/Empty/game/main.cs.in

@@ -57,7 +57,7 @@ $displayHelp = false;
 
 // Use these to record and play back crashes
 //saveJournal("editorOnFileQuitCrash.jrn");
-//playJournal("editorOnFileQuitCrash.jrn", false);
+//playJournal("editorOnFileQuitCrash.jrn");
 
 //------------------------------------------------------------------------------
 // Check if a script file exists, compiled or not.
@@ -186,10 +186,8 @@ function displayHelp() {
       "  <game_name>            Works like the -game argument\n"@
       "  -dir <dir_name>        Add <dir_name> to list of directories\n"@
       "  -console               Open a separate console\n"@
-      "  -show <shape>          Deprecated\n"@
       "  -jSave  <file_name>    Record a journal\n"@
       "  -jPlay  <file_name>    Play back a journal\n"@
-      "  -jDebug <file_name>    Play back a journal and issue an int3 at the end\n"@
       "  -help                  Display this help message\n"
    );
 }

Templates/Full/game/core/parseArgs.cs

@@ -160,7 +160,7 @@ function defaultParseArgs()
             $argUsed[$i]++;
             if ($hasNextArg)
             {
-               playJournal($nextArg,false);
+               playJournal($nextArg);
                $argUsed[$i+1]++;
                $i++;
             }
@@ -240,18 +240,6 @@ function defaultParseArgs()
             else
                error("Error: Missing Command Line argument. Usage: -vidCapHeight <ouput_video_height>");
 
-         //--------------------
-         case "-jDebug":
-            $argUsed[$i]++;
-            if ($hasNextArg)
-            {
-               playJournal($nextArg,true);
-               $argUsed[$i+1]++;
-               $i++;
-            }
-            else
-               error("Error: Missing Command Line argument. Usage: -jDebug <journal_name>");
-
          //--------------------
          case "-level":
             $argUsed[$i]++;

Templates/Full/game/main.cs

@@ -57,7 +57,7 @@ $displayHelp = false;
 
 // Use these to record and play back crashes
 //saveJournal("editorOnFileQuitCrash.jrn");
-//playJournal("editorOnFileQuitCrash.jrn", false);
+//playJournal("editorOnFileQuitCrash.jrn");
 
 //------------------------------------------------------------------------------
 // Check if a script file exists, compiled or not.
@@ -186,10 +186,8 @@ function displayHelp() {
       "  <game_name>            Works like the -game argument\n"@
       "  -dir <dir_name>        Add <dir_name> to list of directories\n"@
       "  -console               Open a separate console\n"@
-      "  -show <shape>          Deprecated\n"@
       "  -jSave  <file_name>    Record a journal\n"@
       "  -jPlay  <file_name>    Play back a journal\n"@
-      "  -jDebug <file_name>    Play back a journal and issue an int3 at the end\n"@
       "  -help                  Display this help message\n"
    );
 }

Templates/Full/game/main.cs.in

@@ -57,7 +57,7 @@ $displayHelp = false;
 
 // Use these to record and play back crashes
 //saveJournal("editorOnFileQuitCrash.jrn");
-//playJournal("editorOnFileQuitCrash.jrn", false);
+//playJournal("editorOnFileQuitCrash.jrn");
 
 //------------------------------------------------------------------------------
 // Check if a script file exists, compiled or not.
@@ -186,10 +186,8 @@ function displayHelp() {
       "  <game_name>            Works like the -game argument\n"@
       "  -dir <dir_name>        Add <dir_name> to list of directories\n"@
       "  -console               Open a separate console\n"@
-      "  -show <shape>          Deprecated\n"@
       "  -jSave  <file_name>    Record a journal\n"@
       "  -jPlay  <file_name>    Play back a journal\n"@
-      "  -jDebug <file_name>    Play back a journal and issue an int3 at the end\n"@
       "  -help                  Display this help message\n"
    );
 }