Commit Graph

314 Commits (jgrpp)

Author SHA1 Message Date
Michael Lutz c082f570ce Codechange: Use std::string when translating TTDP NewGRF string codes. 4 years ago
Michael Lutz 43cd892e0c Codechange: Replace custom linked list for GRF texts with STL vectors and strings. 4 years ago
Michael Lutz f2b40f40aa Codechange: Replace SmallPair with std::pair.
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
4 years ago
Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison edfd378e93 Merge branch 'master' into jgrpp
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
5 years ago
Charles Pigott 71a3e83468 Fix: GCC9's warnings about deprecated implicit assignment operators 5 years ago
JMcKiern 04f659e768 Fix: Some typos found using codespell 5 years ago
Jonathan G Rennison e64706d147 Log string ID in GetGRFStringPtr assertion 5 years ago
Jonathan G Rennison bd2fdde759 Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/sort_func.hpp
#	src/rail_cmd.cpp
#	src/timetable_cmd.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
5 years ago
PeterN d2b6176cdf
Add: NewGRF string codes to access PUSH/POP_COLOUR. (#7527) 5 years ago
Jonathan G Rennison 55fbf37373 Add missing includes to newgrf_text.cpp 5 years ago
Jonathan G Rennison 1c0643e419 Add GRF ID/name to "Too many NewGRF string parameters" messages 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
5 years ago
Henry Wilson c01a2e2a81 Codechange: Removed SmallVector completely 5 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison d1a287d73c Merge branch 'save_ext' into jgrpp 7 years ago
peter1138 0d13f793f2 (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 7 years ago
peter1138 02b6c533aa (svn r27851) -Fix [FS#6555]: StringID truncation to 16 bits broke string remapping test. 7 years ago
Jonathan G Rennison a6168dd2f0 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/company_sl.cpp
7 years ago
frosch 2bb80d280c (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 7 years ago
frosch ce32ca4dc6 (svn r27758) -Change: Increase the maximum number of GameScript texts to 64k, and NewGRF texts to 512k. 7 years ago
frosch a56e2bccd0 (svn r27756) -Codechange: Add StringTab enum 7 years ago
frosch 49b940f69c (svn r27756) -Codechange: Add StringTab enum 7 years ago
frosch f4da8ece0c (svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently. 7 years ago
frosch b54a79f13e (svn r27755) -Codechange: Move TAB_SIZE to strings_type.h and use it consistently. 7 years ago
Jonathan G Rennison 5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
8 years ago
frosch 1a92b0c7c3 (svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided. 8 years ago
frosch 2be42dadea (svn r27707) -Fix: Make the result of NewGRF's CARGO_NAME string code reliably print 'Nothing', if an invalid type is provided. 8 years ago
frosch b25afb239a (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 8 years ago
frosch 9145e5d2b5 (svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type. 8 years ago
Jonathan G Rennison 20a090b077 Show warning dialog if NewGRFs use too many string IDs.
Show when reloading/changing NewGRF config, or starting new game.
8 years ago
frosch 8d8c06ce86 (svn r26713) -Fix (r23027): [NewGRF] Parameters to SCC_NEWGRF_PUSH_WORD and SCC_NEWGRF_UNPRINT were not skipped during drawing. 10 years ago
frosch 9119ebe2ce (svn r26713) -Fix (r23027): [NewGRF] Parameters to SCC_NEWGRF_PUSH_WORD and SCC_NEWGRF_UNPRINT were not skipped during drawing. 10 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
frosch 968ba79de2 (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 11 years ago
frosch e9c22ef16f (svn r26244) -Feature: [NewGRF] Add StringCodes 9A 1B, 9A 1C and 9A 1D to display amounts of cargo. 11 years ago
frosch 3a1fcd76dd (svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there. 11 years ago
frosch 00e7ceeca4 (svn r26243) -Cleanup: Move TTDPStringIDToOTTDStringIDMapping to newgrf.cpp, it's only used there. 11 years ago
frosch bc53bbb8b6 (svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars. 11 years ago
frosch 4f419b8f84 (svn r26242) -Codechange: Use GRFFile that filled the TextRefStack to translate StringIDs from the TextRefStack, instead of passing stuff via global vars. 11 years ago
frosch 7b238142b8 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 11 years ago
frosch ba1779b978 (svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack. 11 years ago
frosch 9215fd3c96 (svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it. 11 years ago
frosch 477c15383d (svn r26239) -Fix: Check that there is space left in the string parameter array, before pushing NewGRF parameters to it. 11 years ago
rubidium 49eaa397ab (svn r26065) -Fix: possible dereference of NULL for texts from game scripts 11 years ago
rubidium c29f18f357 (svn r26065) -Fix: possible dereference of NULL for texts from game scripts 11 years ago
rubidium 73474728e3 (svn r26057) -Fix: a number of possibly uninitialised variables 11 years ago
rubidium b3e93d6520 (svn r26057) -Fix: a number of possibly uninitialised variables 11 years ago
rubidium 2771de7f34 (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
rubidium 7c0f34130c (svn r25454) -Remove/Fix/Cleanup: SETX(Y) does not work at all with other than default fonts, so get rid of it 11 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
yexo 491aee463f (svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble 13 years ago
yexo f917ac0a0f (svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble 13 years ago
yexo 3557d5a784 (svn r23812) -Fix [FS#4977] (r23804): custom ActionB messages were broken 13 years ago
yexo fab78a7bf2 (svn r23812) -Fix [FS#4977] (r23804): custom ActionB messages were broken 13 years ago
yexo 215447b4e8 (svn r23804) -Fix: [NewGRF] Make string code 80 more secure by not crashing when it's used in strings where it's not supposed to be used 13 years ago
yexo 15292fa080 (svn r23804) -Fix: [NewGRF] Make string code 80 more secure by not crashing when it's used in strings where it's not supposed to be used 13 years ago
rubidium c591589818 (svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent 13 years ago
rubidium b8866be093 (svn r23269) -Codechange: rename some control/string codes/IDs to be more consistent 13 years ago
yexo b82d03b4ee (svn r23064) -Fix (r23062): incrementing hexadecimal numbers is hard... 13 years ago
yexo bd6d490987 (svn r23064) -Fix (r23062): incrementing hexadecimal numbers is hard... 13 years ago
yexo bf3565c76e (svn r23063) -Add: [NewGRF] stringscodes 9A 19 and 9A 20 to print 'short volume' and 'short weight' respectively 13 years ago
yexo 307ca24427 (svn r23063) -Add: [NewGRF] stringscodes 9A 19 and 9A 20 to print 'short volume' and 'short weight' respectively 13 years ago
yexo 49c9f656db (svn r23029) -Fix: [NewGRF] support for cases in strings was broken 13 years ago
yexo 47aaf41d40 (svn r23029) -Fix: [NewGRF] support for cases in strings was broken 13 years ago
yexo e6a2682b93 (svn r23027) -Fix: in some cases NewGRF string arguments were popped twice from the newgrf textstack 13 years ago
yexo bac8ce6b41 (svn r23027) -Fix: in some cases NewGRF string arguments were popped twice from the newgrf textstack 13 years ago
rubidium 27644093c2 (svn r22970) -Fix [FS#4769]: strip newlines from NewGRF strings that should not have newlines, e.g. the NewGRF's name 13 years ago
rubidium 7de22e25da (svn r22970) -Fix [FS#4769]: strip newlines from NewGRF strings that should not have newlines, e.g. the NewGRF's name 13 years ago
frosch a44a7e02c6 (svn r22956) -Codechange: Enhance TEXTID_TO_STRINGID() with an assert_compile(). 13 years ago
frosch 514fa060a2 (svn r22956) -Codechange: Enhance TEXTID_TO_STRINGID() with an assert_compile(). 13 years ago
frosch e7387f21af (svn r22954) -Feature: [NewGRF] Allow Action4 to change text IDs 0x00D1 to 0x00E0 for feature 48. 13 years ago
frosch f65a1bd847 (svn r22954) -Feature: [NewGRF] Allow Action4 to change text IDs 0x00D1 to 0x00E0 for feature 48. 13 years ago
yexo 04013f7540 (svn r22952) -Fix: properly limit the length of strings in a choice list 13 years ago
yexo babe53351e (svn r22952) -Fix: properly limit the length of strings in a choice list 13 years ago
frosch fdf6b8daa6 (svn r22882) -Fix [FS#4758]: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash. 13 years ago
frosch 0dca1941ad (svn r22882) -Fix [FS#4758]: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash. 13 years ago
frosch a3a8486aff (svn r22780) -Fix: [NewGRF] String codes 84 and 87 print signed values. 13 years ago
frosch aefee3d375 (svn r22780) -Fix: [NewGRF] String codes 84 and 87 print signed values. 13 years ago
frosch 37ef2d70ad (svn r22779) -Add: [NewGRF] Stringcode for printing a unsinged word in power units. (Hirundo) 13 years ago
frosch 3edfd1c9d2 (svn r22779) -Add: [NewGRF] Stringcode for printing a unsinged word in power units. (Hirundo) 13 years ago
frosch a5b594f85d (svn r22778) -Add: [NewGRF] Stringcodes for printing 0-based dates. (Hirundo) 13 years ago
frosch 26530063f1 (svn r22778) -Add: [NewGRF] Stringcodes for printing 0-based dates. (Hirundo) 13 years ago
frosch a85719d340 (svn r22777) -Fix-ish: [NewGRF] Stringcode 9A 01 is signed, and 9A 0B is kind of unsigned. But since both were already casted to the right types later, this makes actually no difference. 13 years ago
frosch cc89bec4a2 (svn r22777) -Fix-ish: [NewGRF] Stringcode 9A 01 is signed, and 9A 0B is kind of unsigned. But since both were already casted to the right types later, this makes actually no difference. 13 years ago
frosch 701a865391 (svn r22776) -Codechange: Unify the naming of NewGRF string codes; always include the size of the parameter on the stack. (based on patch by Hirundo) 13 years ago
frosch 8d3d7b4e01 (svn r22776) -Codechange: Unify the naming of NewGRF string codes; always include the size of the parameter on the stack. (based on patch by Hirundo) 13 years ago
frosch ffbfd6de88 (svn r22775) -Fix: [NewGRF] Stringcodes 82 and 83 are the same as the date codes in old OpenTTD. (Hirundo) 13 years ago
frosch 7394bcb813 (svn r22775) -Fix: [NewGRF] Stringcodes 82 and 83 are the same as the date codes in old OpenTTD. (Hirundo) 13 years ago
frosch c457737b23 (svn r22774) -Fix: [NewGRF] String codes for dates should use unsigned words, like old OpenTTD did before it learned dates before 1920. (Hirundo) 13 years ago
frosch ca00f98d51 (svn r22774) -Fix: [NewGRF] String codes for dates should use unsigned words, like old OpenTTD did before it learned dates before 1920. (Hirundo) 13 years ago