TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move ResolutionX, ResolutionY to CCfg

Browse source
This commit is contained in:
Kp 2021-01-25 00:45:07 +00:00
parent 4a8d7c7574
commit 81a2d92ee9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/config.h
View file

@ -52,6 +52,8 @@ enum class LevelMusicPlayOrder : uint8_t
struct CCfg : prohibit_void_ptr<CCfg>
{
uint16_t ResolutionX;
uint16_t ResolutionY;
#if DXX_USE_ADLMIDI
int ADLMIDI_num_chips = 6;
/* See common/include/adlmidi_dynamic.h for the symbolic name and for other
@ -83,8 +85,6 @@ namespace dsx {
struct Cfg : prohibit_void_ptr<Cfg>
{
int MusicType;
int ResolutionX;
int ResolutionY;
int AspectX;
int AspectY;
uint8_t DigiVolume;

14
similar/main/config.cpp
View file

@ -128,8 +128,8 @@ int ReadConfigFile()
CGameCfg.GammaLevel = 0;
GameCfg.LastPlayer = {};
CGameCfg.LastMission = "";
GameCfg.ResolutionX = 1024;
GameCfg.ResolutionY = 768;
CGameCfg.ResolutionX = 1024;
CGameCfg.ResolutionY = 768;
GameCfg.AspectX = 3;
GameCfg.AspectY = 4;
CGameCfg.WindowMode = false;
@ -203,9 +203,9 @@ int ReadConfigFile()
else if (cmp(lb, eq, LastMissionStr))
convert_string(CGameCfg.LastMission, value, eol);
else if (cmp(lb, eq, ResolutionXStr))
convert_integer(GameCfg.ResolutionX, value);
convert_integer(CGameCfg.ResolutionX, value);
else if (cmp(lb, eq, ResolutionYStr))
convert_integer(GameCfg.ResolutionY, value);
convert_integer(CGameCfg.ResolutionY, value);
else if (cmp(lb, eq, AspectXStr))
convert_integer(GameCfg.AspectX, value);
else if (cmp(lb, eq, AspectYStr))
@ -255,10 +255,10 @@ int ReadConfigFile()
if ( GameCfg.DigiVolume > 8 ) GameCfg.DigiVolume = 8;
if ( GameCfg.MusicVolume > 8 ) GameCfg.MusicVolume = 8;
if (GameCfg.ResolutionX >= 320 && GameCfg.ResolutionY >= 200)
if (CGameCfg.ResolutionX >= 320 && CGameCfg.ResolutionY >= 200)
{
Game_screen_mode.width = GameCfg.ResolutionX;
Game_screen_mode.height = GameCfg.ResolutionY;
Game_screen_mode.width = CGameCfg.ResolutionX;
Game_screen_mode.height = CGameCfg.ResolutionY;
}
return 0;