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

Catch errors that could happen when reading Scripts.rxdata

Browse source
This commit is contained in:
Jonas Kulla 2013-09-10 04:21:41 +02:00
parent d1bfc1e50c
commit 23c5be6fbe
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
binding-mruby/binding-mruby.cpp
View file

@ -43,6 +43,7 @@
#include "texpool.h" #include "texpool.h"
#include "eventthread.h" #include "eventthread.h"
#include "filesystem.h" #include "filesystem.h"
#include "exception.h"
#include "binding-types.h" #include "binding-types.h"
#include "mrb-ext/marshal.h" #include "mrb-ext/marshal.h"
@ -263,12 +264,25 @@ runRMXPScripts(mrb_state *mrb, mrbc_context *ctx)
gState->fileSystem().openRead(ops, scriptPack.constData()); gState->fileSystem().openRead(ops, scriptPack.constData());
mrb_value scriptArray = marshalLoadInt(scriptMrb, &ops); mrb_value scriptArray = mrb_nil_value();
QByteArray readError;
try
{
scriptArray = marshalLoadInt(scriptMrb, &ops);
}
catch (const Exception &e)
{
char buffer[512];
snprintf(buffer, sizeof(buffer), e.fmt.constData(), e.arg1.constData(), e.arg2.constData());
readError = QByteArray(": ") + QByteArray(buffer);
}
SDL_RWclose(&ops); SDL_RWclose(&ops);
if (!mrb_array_p(scriptArray)) if (!mrb_array_p(scriptArray))
{ {
showError("Failed to read script data"); showError(QByteArray("Failed to read script data") + readError);
mrb_close(scriptMrb); mrb_close(scriptMrb);
return; return;
} }