Fixed compilation, deleted 16bpp blitter

This commit is contained in:
Sergii Pylypenko
2021-11-29 03:15:54 +02:00
parent 2f6b20cbfd
commit a1ef54fa60
22 changed files with 30 additions and 1110 deletions

View File

@@ -225,7 +225,7 @@ cat = SC_BASIC
[SDTC_BOOL]
var = gui.vertical_toolbar
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = true
str = STR_CONFIG_SETTING_VERTICAL_TOOLBAR
strhelp = STR_CONFIG_SETTING_VERTICAL_TOOLBAR_HELPTEXT
@@ -234,7 +234,7 @@ cat = SC_BASIC
[SDTC_BOOL]
var = gui.compact_vertical_toolbar
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = true
str = STR_CONFIG_SETTING_COMPACT_VERTICAL_TOOLBAR
strhelp = STR_CONFIG_SETTING_COMPACT_VERTICAL_TOOLBAR_HELPTEXT
@@ -242,7 +242,7 @@ cat = SC_BASIC
[SDTC_BOOL]
var = gui.build_confirmation
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = true
str = STR_CONFIG_SETTING_BUILD_CONFIRMATION
strhelp = STR_CONFIG_SETTING_BUILD_CONFIRMATION_HELPTEXT
@@ -250,7 +250,7 @@ cat = SC_BASIC
[SDTC_BOOL]
var = gui.windows_titlebars
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = false
str = STR_CONFIG_SETTING_WINDOWS_TITLEBARS
strhelp = STR_CONFIG_SETTING_WINDOWS_TITLEBARS_HELPTEXT
@@ -258,7 +258,7 @@ cat = SC_BASIC
[SDTC_BOOL]
var = gui.draw_mouse_cursor
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = true
str = STR_CONFIG_SETTING_MOUSE_CURSOR
strhelp = STR_CONFIG_SETTING_MOUSE_CURSOR_HELPTEXT
@@ -266,7 +266,7 @@ cat = SC_BASIC
[SDTC_BOOL]
var = gui.windows_decorations
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = true
str = STR_CONFIG_SETTING_WINDOWS_DECORATIONS
strhelp = STR_CONFIG_SETTING_WINDOWS_DECORATIONS_HELPTEXT

View File

@@ -16,6 +16,7 @@
[pre-amble]
static constexpr std::initializer_list<const char*> _town_names{"english", "french", "german", "american", "latin", "silly", "swedish", "dutch", "finnish", "polish", "slovak", "norwegian", "hungarian", "austrian", "romanian", "czech", "swiss", "danish", "turkish", "italian", "catalan"};
static constexpr std::initializer_list<const char*> _climates{"temperate", "arctic", "tropic", "toyland"};
static constexpr std::initializer_list<const char*> _save_to_network{"disabled", "enabled", "ask"};
static const SettingVariant _old_gameopt_settings_table[] = {
/* In version 4 a new difficulty setting has been added to the difficulty settings,
@@ -154,7 +155,7 @@ cat = SC_BASIC
[SDTC_OMANY]
var = gui.save_to_network
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC
def = 2
max = 2
full = _save_to_network