TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
playJournal fix and removed depcrecated command line options
This commit is contained in:
Areloch 2015-11-09 10:24:30 -06:00
commit 9d726bb9ed
6 changed files with 6 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Templates/Empty/game/core/parseArgs.cs
View file

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

4
Templates/Empty/game/main.cs
View file

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

4
Templates/Empty/game/main.cs.in
View file

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

14
Templates/Full/game/core/parseArgs.cs
View file

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

4
Templates/Full/game/main.cs
View file

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

4
Templates/Full/game/main.cs.in
View file

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