mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-19 21:39:57 +00:00
rgfjg
This commit is contained in:
parent
0d480316e5
commit
b2494fa184
6 changed files with 27 additions and 5 deletions
|
|
@ -4,7 +4,7 @@ include(FindPackageHandleStandardArgs)
|
||||||
|
|
||||||
# Options
|
# Options
|
||||||
option(STEAM "Build for Steam" OFF)
|
option(STEAM "Build for Steam" OFF)
|
||||||
option(DEBUG "Debug mode" ON)
|
option(DEBUG "Debug mode" OFF)
|
||||||
option(NATIVE "Use native instructions(for local use only)" OFF)
|
option(NATIVE "Use native instructions(for local use only)" OFF)
|
||||||
|
|
||||||
#Configuration
|
#Configuration
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include <ruby.h>
|
#include <ruby.h>
|
||||||
//костыль ебаный сука
|
//костыль ебаный сука
|
||||||
#undef SDL_snprintf
|
#undef snprintf
|
||||||
#undef inline
|
#undef inline
|
||||||
|
|
||||||
#include "exception.h"
|
#include "exception.h"
|
||||||
|
|
|
||||||
|
|
@ -78,3 +78,4 @@ Rewrited Linux build scripts
|
||||||
Deleted unused maps
|
Deleted unused maps
|
||||||
Game maps size fixed
|
Game maps size fixed
|
||||||
Big performance fix
|
Big performance fix
|
||||||
|
Added way to select prefered Scaling mode via Settings
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ module Settings
|
||||||
:frameskip => true,
|
:frameskip => true,
|
||||||
:twm_shader => true,
|
:twm_shader => true,
|
||||||
:light => true,
|
:light => true,
|
||||||
:light_shadows => true,
|
:scaling_mode => 0,
|
||||||
|
|
||||||
# UI
|
# UI
|
||||||
:in_game_timer => false,
|
:in_game_timer => false,
|
||||||
|
|
@ -168,6 +168,12 @@ class Window_Settings
|
||||||
:name => tr('Dynamic Light'),
|
:name => tr('Dynamic Light'),
|
||||||
:parameter => :light,
|
:parameter => :light,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
:type => :enum,
|
||||||
|
:name => tr('Scaling mode'),
|
||||||
|
:parameter => :scaling_mode,
|
||||||
|
:values => [tr("Nearest Neighbor"), tr("Smooth(old)")]
|
||||||
|
},
|
||||||
],
|
],
|
||||||
tr("UI") => [
|
tr("UI") => [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,15 @@ module Settings
|
||||||
Graphics.resize_screen(new_width, new_height)
|
Graphics.resize_screen(new_width, new_height)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def scaling_mode(value)
|
||||||
|
if value == 0
|
||||||
|
Graphics.smooth = false
|
||||||
|
else
|
||||||
|
Graphics.smooth = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def colorblind(value)
|
def colorblind(value)
|
||||||
$game_switches[252] = value
|
$game_switches[252] = value
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,11 @@
|
||||||
#include "gl-fun.h"
|
#include "gl-fun.h"
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
#include "security.h"
|
#include "security.h"
|
||||||
#include "modloader.h"
|
|
||||||
|
#ifndef ps2
|
||||||
|
#include "modloader.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "sunshine.h"
|
#include "sunshine.h"
|
||||||
|
|
||||||
#include "define.h"
|
#include "define.h"
|
||||||
|
|
@ -299,6 +303,7 @@ int main(int argc, char *argv[]){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef ps2
|
||||||
std::string new_path = ModLoader(conf);
|
std::string new_path = ModLoader(conf);
|
||||||
if(new_path != ""){
|
if(new_path != ""){
|
||||||
if (chdir(new_path.c_str()) != 0){
|
if (chdir(new_path.c_str()) != 0){
|
||||||
|
|
@ -306,6 +311,7 @@ int main(int argc, char *argv[]){
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
extern int screenMain(Config &conf);
|
extern int screenMain(Config &conf);
|
||||||
if (conf.screenMode)
|
if (conf.screenMode)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue