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

Get a game running with 1.8 (Used Ao Oni)

Browse source
This commit is contained in:
Inori 2019-07-30 03:31:34 -04:00 • committed by Inori
parent 5bccdb761f
commit be9eda93c0
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binding-mri/binding-util.h
View file

@ -394,7 +394,7 @@ static inline VALUE
rb_file_open_str(VALUE filename, const char *mode) rb_file_open_str(VALUE filename, const char *mode)
{ {
VALUE fileobj = rb_const_get(rb_cObject, rb_intern("File")); VALUE fileobj = rb_const_get(rb_cObject, rb_intern("File"));
return rb_funcall(fileobj, rb_intern("open"), 2, filename, mode); return rb_funcall(fileobj, rb_intern("open"), 2, filename, rb_str_new2(mode));
} }
#endif #endif

9
binding-mri/filesystem-binding.cpp
View file

@ -132,8 +132,15 @@ VALUE
kernelLoadDataInt(const char *filename, bool rubyExc) kernelLoadDataInt(const char *filename, bool rubyExc)
{ {
rb_gc_start(); rb_gc_start();
#ifndef OLD_RUBY
VALUE port = fileIntForPath(filename, rubyExc); VALUE port = fileIntForPath(filename, rubyExc);
#else
// the above results in an uninitialized IO,
// so let's use Ruby to open the file instead
// hopefully a temporary fix
VALUE port = rb_file_open_str(rb_str_new2(filename), "rb");
#endif
VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal")); VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal"));