Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'save_ext' into improved_breakdowns-sx

Browse Source
This commit is contained in:
Jonathan G Rennison 2015-08-07 20:16:35 +01:00
commit 0055e283f1
5 changed files with 361 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

680
src/lang/catalan.txt
View File

File diff suppressed because it is too large Load Diff

15
src/lang/slovenian.txt
View File

@ -517,6 +517,7 @@ STR_SCENEDIT_FILE_MENU_QUIT :Izhod
############ range for settings menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Možnosti igre
STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE :Nastavitve
STR_SETTINGS_MENU_SCRIPT_SETTINGS :UI/Nastavitve skriptov igre
STR_SETTINGS_MENU_NEWGRF_SETTINGS :NewGRF nastavitve
STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS :Nastavitve prozornega pogleda
@ -1123,7 +1124,10 @@ STR_GAME_OPTIONS_RESOLUTION :{BLACK}Ločljiv
STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Izberi ločljivost zaslona
STR_GAME_OPTIONS_RESOLUTION_OTHER :drugo
STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Velikost vmesnika
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Normalno
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Dvojna velikost
STR_GAME_OPTIONS_BASE_GRF :{BLACK}Osnovni komplet grafik
STR_GAME_OPTIONS_BASE_GRF_TOOLTIP :{BLACK}Izberi osnovni komplet grafik za uporabo
@ -1217,6 +1221,7 @@ STR_TERRAIN_TYPE_VERY_FLAT :Zelo raven
STR_TERRAIN_TYPE_FLAT :Raven
STR_TERRAIN_TYPE_HILLY :Hribovit
STR_TERRAIN_TYPE_MOUNTAINOUS :Gorat
STR_TERRAIN_TYPE_ALPINIST :Alpinist
STR_CITY_APPROVAL_PERMISSIVE :Dopustno
STR_CITY_APPROVAL_TOLERANT :Tolerantno
@ -1225,6 +1230,7 @@ STR_CITY_APPROVAL_HOSTILE :Sovražno
STR_WARNING_NO_SUITABLE_AI :{WHITE}Ni na voljo nobene uporabne UI.{}UI so na voljo preko 'Prenosa vsebin'.
# Settings tree window
STR_CONFIG_SETTING_TREE_CAPTION :{WHITE}Nastavitve
STR_CONFIG_SETTING_FILTER_TITLE :{BLACK}Filtriraj niz:
STR_CONFIG_SETTING_EXPAND_ALL :{BLACK}Razširi vse
STR_CONFIG_SETTING_COLLAPSE_ALL :{BLACK}Skrči vse
@ -1238,6 +1244,7 @@ STR_CONFIG_SETTING_TYPE_COMPANY_MENU :Nastavitve podj
STR_CONFIG_SETTING_TYPE_COMPANY_INGAME :Nastavitve podjetja (shranjeno v igrah, vpliva samo na trenutno podjetje)
STR_CONFIG_SETTING_RESTRICT_CATEGORY :{BLACK}Kategorija:
STR_CONFIG_SETTING_RESTRICT_TYPE :{BLACK}Tip:
STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT :{BLACK}Omeji seznam na prikaz le spremenjenih nastavitev
STR_CONFIG_SETTING_RESTRICT_BASIC :Osnovne nastavitve
STR_CONFIG_SETTING_RESTRICT_ADVANCED :Napredne nastavitve
@ -1847,6 +1854,7 @@ STR_INTRO_MULTIPLAYER :{BLACK}Več igr
STR_INTRO_GAME_OPTIONS :{BLACK}Možnosti
STR_INTRO_HIGHSCORE :{BLACK}Tabela najboljših rezultatov
STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Nastavitve
STR_INTRO_NEWGRF_SETTINGS :{BLACK}NewGRF nastavitve
STR_INTRO_ONLINE_CONTENT :{BLACK}Preveri razpoložljive vsebine
STR_INTRO_SCRIPT_SETTINGS :{BLACK}UI / Nastavitve skriptov igre
@ -1866,6 +1874,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Izberi o
STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Prikaži možnosti igre
STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Prikaži tabelo najboljših rezultatov
STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Nastavitve zaslona
STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}Prikaži nastavitve NewGRF
STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Preveri posodobljene vsebine na strežniku,{} ki so na voljo za prenos
STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK}Prikaži UI in Nastavitve skriptov igre
@ -2830,6 +2839,7 @@ STR_MAPGEN_BY :{BLACK}*
STR_MAPGEN_NUMBER_OF_TOWNS :{BLACK}Število mest:
STR_MAPGEN_DATE :{BLACK}Datum:
STR_MAPGEN_NUMBER_OF_INDUSTRIES :{BLACK}Število industrij:
STR_MAPGEN_MAX_HEIGHTLEVEL :{BLACK}Maksimalna višina mape:
STR_MAPGEN_SNOW_LINE_HEIGHT :{BLACK}Višina snežne meje:
STR_MAPGEN_SNOW_LINE_UP :{BLACK}Premik snežne meje eno enoto višje
STR_MAPGEN_SNOW_LINE_DOWN :{BLACK}Premik snežne meje eno enoto nižje
@ -2859,6 +2869,7 @@ STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Ime viš
STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Velikost:
STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} x {NUM}
STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT :{WHITE}Spremeni maksimalno višino mape
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Spremeni višino snežne meje
STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Spremeni začetno leto
@ -2974,6 +2985,10 @@ STR_SPRITE_ALIGNER_PREVIOUS_BUTTON :{BLACK}Prejšnj
STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP :{BLACK}Nadaljuj k prejšnji navadni sličici, zanemari vse navidezne/pobarvane/besedilne sličice in okvir na koncu
STR_SPRITE_ALIGNER_SPRITE_TOOLTIP :{BLACK}Predstavitev trenutno izbrane sličice. Zamik je zanemarjen pri risanju te sličice
STR_SPRITE_ALIGNER_MOVE_TOOLTIP :{BLACK}Premakni sličico s spreminjanjem X in Y osi
STR_SPRITE_ALIGNER_RESET_BUTTON :{BLACK}Resetiraj relativno
STR_SPRITE_ALIGNER_RESET_TOOLTIP :{BLACK}Resetiraj zdajšne relativne odmike
STR_SPRITE_ALIGNER_OFFSETS_ABS :{BLACK}X odmik: {NUM}, Y odmik: {NUM} (Absolutno)
STR_SPRITE_ALIGNER_OFFSETS_REL :{BLACK}X odmik: {NUM}, Y odmik: {NUM} (Relativno)
STR_SPRITE_ALIGNER_PICKER_BUTTON :{BLACK}Izberi sličico
STR_SPRITE_ALIGNER_PICKER_TOOLTIP :{BLACK}Izberi sličico kjerkoli na zaslonu

2
src/rail_cmd.cpp
View File

@ -1975,7 +1975,7 @@ static void DrawTrackDetails(const TileInfo *ti, const RailtypeInfo *rti)
/* Base sprite for track fences.
* Note: Halftile slopes only have fences on the upper part. */
uint num_sprites = 0;
SpriteID base_image = GetCustomRailSprite(rti, ti->tile, RTSG_FENCES, IsHalftileSlope(ti->tileh) ? TCX_UPPER_HALFTILE : TCX_NORMAL);
SpriteID base_image = GetCustomRailSprite(rti, ti->tile, RTSG_FENCES, IsHalftileSlope(ti->tileh) ? TCX_UPPER_HALFTILE : TCX_NORMAL, &num_sprites);
if (base_image == 0) {
base_image = SPR_TRACK_FENCE_FLAT_X;
num_sprites = 8;

2
src/saveload/extended_ver_sl.h
View File

@ -76,6 +76,8 @@ enum SlxiSubChunkFlags {
XSCF_IGNORABLE_VERSION = 1 << 1, ///< the loader is free to ignore this without aborting the load if the version is greater than the maximum that can be loaded
XSCF_EXTRA_DATA_PRESENT = 1 << 2, ///< extra data field is present, extra data in some sub-chunk/feature specific format, not used for anything yet
XSCF_CHUNK_ID_LIST_PRESENT = 1 << 3, ///< chunk ID list field is present, list of chunks which this sub-chunk/feature adds to the save game, this can be used to discard the chunks if the feature is unknown
XSCF_IGNORABLE_ALL = XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION, ///< all "ignorable" flags
};
DECLARE_ENUM_AS_BIT_SET(SlxiSubChunkFlags)

5
src/saveload/saveload.cpp
View File

@ -2467,8 +2467,6 @@ static inline void ClearSaveLoadState()
delete _sl.lf;
_sl.lf = NULL;
SlXvSetCurrentState();
}
/**
@ -2780,6 +2778,8 @@ static SaveOrLoadResult DoLoad(LoadFilter *reader, bool load_check)
GamelogStopAction();
}
SlXvSetCurrentState();
return SL_OK;
}
@ -2839,6 +2839,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb, boo
return SL_REINIT;
}
GamelogStopAction();
SlXvSetCurrentState();
return SL_OK;
}