snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-20 22:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mathewv/master'

Browse source
This commit is contained in:
Vinyl Darkscratch 2016-12-14 21:10:23 -08:00
commit 582b750c2b
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -223,7 +223,7 @@ fileIntBindingInit()
/* We overload the built-in 'Marshal::load()' function to silently
* insert our utf8proc that ensures all read strings will be
* UTF-8 encoded */
VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal"));
rb_define_alias(rb_singleton_class(marsh), "_mkxp_load_alias", "load");
_rb_define_module_function(marsh, "load", _marshalLoad);
// VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal"));
// rb_define_alias(rb_singleton_class(marsh), "_mkxp_load_alias", "load");
// _rb_define_module_function(marsh, "load", _marshalLoad);
}

2
binding-mri/graphics-binding.cpp
View file

@ -202,6 +202,7 @@ DEF_GRA_PROP_B(Smooth)
DEF_GRA_PROP_B(Fullscreen)
DEF_GRA_PROP_B(ShowCursor)
DEF_GRA_PROP_B(Smooth)
#define INIT_GRA_PROP_BIND(PropName, prop_name_s) \
{ \
@ -245,4 +246,5 @@ void graphicsBindingInit()
INIT_GRA_PROP_BIND( Fullscreen, "fullscreen" );
INIT_GRA_PROP_BIND( ShowCursor, "show_cursor" );
INIT_GRA_PROP_BIND( Smooth, "smooth" );
}

10
src/graphics.cpp
View file

@ -1044,6 +1044,16 @@ void Graphics::setFullscreen(bool value)
p->threadData->ethread->requestFullscreenMode(value);
}
bool Graphics::getSmooth() const
{
return p->threadData->config.smoothScaling;
}
void Graphics::setSmooth(bool value)
{
p->threadData->config.smoothScaling = value;
}
bool Graphics::getShowCursor() const
{
return p->threadData->ethread->getShowCursor();

1
src/graphics.h
View file

@ -63,6 +63,7 @@ public:
/* Non-standard extension */
DECL_ATTR( Fullscreen, bool )
DECL_ATTR( ShowCursor, bool )
DECL_ATTR( Smooth, bool )
/* <internal> */
Scene *getScreen() const;