mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-22 23:06:18 +00:00
aedfgsdg
This commit is contained in:
parent
d9347ca454
commit
c237203e1a
3 changed files with 9 additions and 11 deletions
|
|
@ -79,9 +79,7 @@ raiseRbExc(const Exception &exc);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEF_TYPE_CUSTOMNAME_AND_FREE(Klass, Name, Free) \
|
#define DEF_TYPE_CUSTOMNAME_AND_FREE(Klass, Name, Free) \
|
||||||
rb_data_type_t Klass##Type = { \
|
rb_data_type_t Klass##Type = { Name, { 0, Free, 0, { 0, 0 } }, 0, 0, (void*)DEF_TYPE_FLAGS }
|
||||||
Name, { 0, Free, 0, { 0, 0 } }, 0, 0, DEF_TYPE_FLAGS \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define DEF_TYPE_CUSTOMFREE(Klass, Free) \
|
#define DEF_TYPE_CUSTOMFREE(Klass, Free) \
|
||||||
DEF_TYPE_CUSTOMNAME_AND_FREE(Klass, #Klass, Free)
|
DEF_TYPE_CUSTOMNAME_AND_FREE(Klass, #Klass, Free)
|
||||||
|
|
|
||||||
|
|
@ -40,11 +40,11 @@ DEF_TYPE_CUSTOMFREE(FileInt, fileIntFreeInstance);
|
||||||
static VALUE
|
static VALUE
|
||||||
fileIntForPath(const char *path, bool rubyExc)
|
fileIntForPath(const char *path, bool rubyExc)
|
||||||
{
|
{
|
||||||
SDL_IOStream *ops;
|
SDL_IOStream* ops;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
shState->fileSystem().openReadRaw(*ops, path);
|
shState->fileSystem().openReadRaw(ops*, path);
|
||||||
}
|
}
|
||||||
catch (const Exception &e)
|
catch (const Exception &e)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -99,9 +99,9 @@ RB_METHOD(nikoPrepare)
|
||||||
RB_UNUSED_PARAM;
|
RB_UNUSED_PARAM;
|
||||||
|
|
||||||
// Prime native window info
|
// Prime native window info
|
||||||
syswm::SDL_SysWMinfo syswindow;
|
//syswm::SDL_SysWMinfo syswindow;
|
||||||
SDL_VERSION(&syswindow.version);
|
//SDL_VERSION(&syswindow.version);
|
||||||
SDL_GetWindowWMInfo(shState->rtData().window, &syswindow);
|
//SDL_GetWindowWMInfo(shState->rtData().window, &syswindow);
|
||||||
|
|
||||||
#ifdef LINUX
|
#ifdef LINUX
|
||||||
char path[PATH_MAX];
|
char path[PATH_MAX];
|
||||||
|
|
@ -133,9 +133,9 @@ RB_METHOD(nikoStart)
|
||||||
RB_UNUSED_PARAM;
|
RB_UNUSED_PARAM;
|
||||||
|
|
||||||
// Prime native window info
|
// Prime native window info
|
||||||
syswm::SDL_SysWMinfo syswindow;
|
//syswm::SDL_SysWMinfo syswindow;
|
||||||
SDL_VERSION(&syswindow.version);
|
//SDL_VERSION(&syswindow.version);
|
||||||
SDL_GetWindowWMInfo(shState->rtData().window, &syswindow);
|
//SDL_GetWindowWMInfo(shState->rtData().window, &syswindow);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
// Calculate where to stick the window
|
// Calculate where to stick the window
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue