Skip to content

dedomized the scriptfiles names required by IdTechX #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BielBdeLuna wants to merge 1 commit into
base: cegui_layout
Choose a base branch
from
Open

dedomized the scriptfiles names required by IdTechX #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions neo/d3xp/Game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ namespace BFG
*/

// default scripts
#define SCRIPT_DEFAULTDEFS "script/doom_defs.script"
#define SCRIPT_DEFAULT "script/doom_main.script"
#define SCRIPT_DEFAULTFUNC "doom_main"
#define SCRIPT_DEFAULTDEFS "script/defs.globals"
#define SCRIPT_DEFAULT "script/main.script"
#define SCRIPT_DEFAULTNAME "main.script"
#define SCRIPT_DEFAULTFUNC "default_func"

struct gameReturn_t
{
Expand Down
8 changes: 4 additions & 4 deletions neo/d3xp/gamesys/SysCmds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ void Cmd_ReloadScript_f( const idCmdArgs& args )
// recompile the scripts
gameLocal.program.Startup( SCRIPT_DEFAULT );

if( fileSystem->ReadFile( "doom_main.script", NULL ) > 0 )
if( fileSystem->ReadFile( SCRIPT_DEFAULTNAME, NULL ) > 0 )
{
gameLocal.program.CompileFile( "doom_main.script" );
gameLocal.program.CompileFile( SCRIPT_DEFAULTNAME );
gameLocal.program.FinishCompilation();
}

Expand All @@ -241,9 +241,9 @@ CONSOLE_COMMAND( reloadScript2, "Doesn't thow an error... Use this when switchi
// recompile the scripts
gameLocal.program.Startup( SCRIPT_DEFAULT );

if( fileSystem->ReadFile( "doom_main.script", NULL ) > 0 )
if( fileSystem->ReadFile( SCRIPT_DEFAULTNAME, NULL ) > 0 )
{
gameLocal.program.CompileFile( "doom_main.script" );
gameLocal.program.CompileFile( SCRIPT_DEFAULTNAME );
gameLocal.program.FinishCompilation();
}
}
Expand Down