MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Linked to debugMode option, gutted RTP config

Browse source
This commit is contained in:
Mathew 2015-11-26 18:11:08 -05:00 • committed by Mathew Velasquez
parent 189556652c
commit 917d320342
5 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
binding-mri/binding-mri.cpp
View file

@ -404,6 +404,9 @@ static void runRMXPScripts(BacktraceData &btData)
return; return;
} }
/* Set the debug flag */
rb_gv_set("$DEBUG", conf.debugMode ? Qtrue : Qfalse);
rb_gv_set("$RGSS_SCRIPTS", scriptArray); rb_gv_set("$RGSS_SCRIPTS", scriptArray);
long scriptCount = RARRAY_LEN(scriptArray); long scriptCount = RARRAY_LEN(scriptArray);

3
scripts/Main.rb
View file

@ -5,9 +5,6 @@
#============================================================================== #==============================================================================
begin begin
$DEBUG = true
$DEMO = false
Graphics.frame_rate = 60 Graphics.frame_rate = 60
Font.default_size = 20 Font.default_size = 20

3
src/config.cpp
View file

@ -170,7 +170,6 @@ void Config::read(int argc, char *argv[])
podesc.add_options() podesc.add_options()
PO_DESC_ALL PO_DESC_ALL
("preloadScript", po::value<StringVec>()->composing()) ("preloadScript", po::value<StringVec>()->composing())
("RTP", po::value<StringVec>()->composing())
("fontSub", po::value<StringVec>()->composing()) ("fontSub", po::value<StringVec>()->composing())
("rubyLoadpath", po::value<StringVec>()->composing()) ("rubyLoadpath", po::value<StringVec>()->composing())
; ;
@ -212,8 +211,6 @@ void Config::read(int argc, char *argv[])
GUARD_ALL( preloadScripts = vm["preloadScript"].as<StringVec>(); ); GUARD_ALL( preloadScripts = vm["preloadScript"].as<StringVec>(); );
GUARD_ALL( rtps = vm["RTP"].as<StringVec>(); );
GUARD_ALL( fontSubs = vm["fontSub"].as<StringVec>(); ); GUARD_ALL( fontSubs = vm["fontSub"].as<StringVec>(); );
GUARD_ALL( rubyLoadpaths = vm["rubyLoadpath"].as<StringVec>(); ); GUARD_ALL( rubyLoadpaths = vm["rubyLoadpath"].as<StringVec>(); );

1
src/config.h
View file

@ -69,7 +69,6 @@ struct Config
} SE; } SE;
std::vector<std::string> preloadScripts; std::vector<std::string> preloadScripts;
std::vector<std::string> rtps;
std::vector<std::string> fontSubs; std::vector<std::string> fontSubs;

3
src/sharedstate.cpp
View file

@ -132,9 +132,6 @@ struct SharedStatePrivate
fileSystem.addPath("."); fileSystem.addPath(".");
for (size_t i = 0; i < config.rtps.size(); ++i)
fileSystem.addPath(config.rtps[i].c_str());
if (config.pathCache) if (config.pathCache)
fileSystem.createPathCache(); fileSystem.createPathCache();