MapleShrine/mkxp
1
0
Fork 0
Code Issues32 Pull requests11 Projects Releases Wiki Activity

RGSS_SCRIPTS #23

Closed
cremno wants to merge 2 commits from mri-rgss-scripts into master
Conversation 0 Commits 2 Files changed 1 +17 -5
1 changed files with 17 additions and 5 deletions

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

@ -210,6 +210,8 @@ static void runRMXPScripts()
return; return;
} }
rb_gv_set("$RGSS_SCRIPTS", scriptArray);
long scriptCount = RARRAY_LEN(scriptArray); long scriptCount = RARRAY_LEN(scriptArray);
std::string decodeBuffer; std::string decodeBuffer;
@ -259,16 +261,25 @@ static void runRMXPScripts()
break; break;
} }
rb_ary_store(script, 3, rb_str_new_cstr(decodeBuffer.c_str()));
}
for (long i = 0; i < scriptCount; ++i)
{
VALUE script = rb_ary_entry(scriptArray, i);
VALUE scriptDecoded = rb_ary_entry(script, 3);
/* Store encoding header + the decoded script /* Store encoding header + the decoded script
* in 'sc.decData' */ * in 'sc.decData' */
std::string decData = "#encoding:utf-8\n"; std::string decData = "#encoding:utf-8\n";
size_t hdSize = decData.size(); size_t hdSize = decData.size();
decData.resize(hdSize + bufferLen); const char *scriptDecPtr;
memcpy(&decData[hdSize], decodeBuffer.c_str(), bufferLen); long scriptDecLen;
RSTRING_GETMEM(scriptDecoded, scriptDecPtr, scriptDecLen);
decData.resize(hdSize + scriptDecLen);
memcpy(&decData[hdSize], scriptDecPtr, scriptDecLen);
ruby_script(RSTRING_PTR(scriptName)); ruby_script(RSTRING_PTR(rb_ary_entry(script, 1)));
rb_gc_start();
/* Execute code */ /* Execute code */
rb_eval_string_protect(decData.c_str(), 0); rb_eval_string_protect(decData.c_str(), 0);
@ -279,6 +290,7 @@ static void runRMXPScripts()
} }
} }
static void mriBindingExecute() static void mriBindingExecute()
{ {
ruby_setup(); ruby_setup();