mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-07-01 22:25:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust error messages for script load failure

Browse source
This commit is contained in:
Struma 2023-05-21 19:48:33 -04:00
parent b0d8e0b2ba
commit 39f7cb45b7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
binding/audio-binding.cpp
View file

@ -94,7 +94,7 @@ RB_METHOD(audio_bgmPlay)
int volume = 100; int volume = 100;
int pitch = 100; int pitch = 100;
double pos = 0.0; double pos = 0.0;
VALUE track; VALUE track = Qnil;
rb_get_args(argc, argv, "z|iifo", &filename, &volume, &pitch, &pos, &track RB_ARG_END); rb_get_args(argc, argv, "z|iifo", &filename, &volume, &pitch, &pos, &track RB_ARG_END);
GUARD_EXC( shState->audio().bgmPlay(filename, volume, pitch, pos, MAYBE_NIL_TRACK(track)); ) GUARD_EXC( shState->audio().bgmPlay(filename, volume, pitch, pos, MAYBE_NIL_TRACK(track)); )
return Qnil; return Qnil;
@ -103,7 +103,7 @@ RB_METHOD(audio_bgmPlay)
RB_METHOD(audio_bgmStop) RB_METHOD(audio_bgmStop)
{ {
RB_UNUSED_PARAM; RB_UNUSED_PARAM;
VALUE track; VALUE track = Qnil;
rb_get_args(argc, argv, "|o", &track RB_ARG_END); rb_get_args(argc, argv, "|o", &track RB_ARG_END);
shState->audio().bgmStop(MAYBE_NIL_TRACK(track)); shState->audio().bgmStop(MAYBE_NIL_TRACK(track));
return Qnil; return Qnil;
@ -112,7 +112,7 @@ RB_METHOD(audio_bgmStop)
RB_METHOD(audio_bgmPos) RB_METHOD(audio_bgmPos)
{ {
RB_UNUSED_PARAM; RB_UNUSED_PARAM;
VALUE track; VALUE track = Qnil;
rb_get_args(argc, argv, "|o", &track RB_ARG_END); rb_get_args(argc, argv, "|o", &track RB_ARG_END);
return rb_float_new(shState->audio().bgmPos(MAYBE_NIL_TRACK(track))); return rb_float_new(shState->audio().bgmPos(MAYBE_NIL_TRACK(track)));
} }
@ -120,7 +120,7 @@ RB_METHOD(audio_bgmPos)
RB_METHOD(audio_bgmGetVolume) RB_METHOD(audio_bgmGetVolume)
{ {
RB_UNUSED_PARAM; RB_UNUSED_PARAM;
VALUE track; VALUE track = Qnil;
rb_get_args(argc, argv, "|o", &track RB_ARG_END); rb_get_args(argc, argv, "|o", &track RB_ARG_END);
int ret = 0; int ret = 0;
GUARD_EXC( ret = shState->audio().bgmGetVolume(MAYBE_NIL_TRACK(track)); ) GUARD_EXC( ret = shState->audio().bgmGetVolume(MAYBE_NIL_TRACK(track)); )
@ -131,7 +131,7 @@ RB_METHOD(audio_bgmSetVolume)
{ {
RB_UNUSED_PARAM; RB_UNUSED_PARAM;
int volume; int volume;
VALUE track; VALUE track = Qnil;
rb_get_args(argc, argv, "i|o", &volume, &track RB_ARG_END); rb_get_args(argc, argv, "i|o", &volume, &track RB_ARG_END);
GUARD_EXC( shState->audio().bgmSetVolume(volume, MAYBE_NIL_TRACK(track)); ) GUARD_EXC( shState->audio().bgmSetVolume(volume, MAYBE_NIL_TRACK(track)); )
return Qnil; return Qnil;
@ -146,7 +146,7 @@ RB_METHOD(audio_bgmFade)
{ {
RB_UNUSED_PARAM; RB_UNUSED_PARAM;
int time; int time;
VALUE track; VALUE track = Qnil;
rb_get_args(argc, argv, "i|o", &time, &track RB_ARG_END); rb_get_args(argc, argv, "i|o", &time, &track RB_ARG_END);
shState->audio().bgmFade(time, MAYBE_NIL_TRACK(track)); shState->audio().bgmFade(time, MAYBE_NIL_TRACK(track));
return Qnil; return Qnil;

4
binding/binding-mri.cpp
View file

@ -875,12 +875,12 @@ static void runRMXPScripts(BacktraceData &btData) {
const std::string &scriptPack = conf.game.scripts; const std::string &scriptPack = conf.game.scripts;
if (scriptPack.empty()) { if (scriptPack.empty()) {
showMsg("No game scripts specified (missing Game.ini?)"); showMsg("No script file has been specified. Check the game's INI and try again.");
return; return;
} }
if (!shState->fileSystem().exists(scriptPack.c_str())) { if (!shState->fileSystem().exists(scriptPack.c_str())) {
showMsg("Unable to open '" + scriptPack + "'"); showMsg("Unable to load scripts from '" + scriptPack + "'");
return; return;
} }