Commit Graph

49 Commits (fe730bce316520cb84c4e0594a337a64ac21ddb2)

Author SHA1 Message Date
Jonathan G Rennison fe730bce31 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/codeql.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	src/map.cpp
#	src/music/midifile.hpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/pbs.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_text.cpp
#	src/ship_cmd.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_func.h
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
3 months ago
Peter Nelson 55a328c586
Codechange: Replace type-punning with `std::bit_cast` in squirrel. (#12224) 3 months ago
Jonathan G Rennison fdd666f66a Merge tag '14.0-beta1' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp
3 months ago
frosch b1718478c8 Codechange: Replace old non-standard attributes with C++17/20 standard attributes. 4 months ago
Jonathan G Rennison 48b6b1844a
Change: Limit total script ops that can be consumed by a list valuate (#11670) 5 months ago
Jonathan G Rennison be4f8b91c6 Change: Limit total script ops that can be consumed by a list valuate
(cherry picked from commit 1d0b40b2b2f2998d96221b18ae65a4d1524c61a7)
5 months ago
Rubidium 4fbc81003f Codechange: make SQString::Create that supports std::string and use that 12 months ago
Rubidium 8f24901843 Codechange: replace printf with PRINTF macros by fmt::format for scripts 1 year ago
Rubidium 5733142b0d Codechange: use string/fmt instead of printf for Squirrel's Raise_Error 1 year ago
rubidium42 1951af07c0 Codechange: do not hide parameters with local variables 1 year ago
Rubidium 5863d78cb4 Codechange: use commented out code, or guard by #ifdef 1 year ago
Rubidium 281a65b3e1 Cleanup: simplify some boolean expressions 3 years ago
Rubidium a9774f3e34 Cleanup: [Squirrel] Use nullptr instead of 0 or NULL 3 years ago
Patric Stout 28e90769f7 Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had
While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
3 years ago
Charles Pigott dd798d688b
Fix #8919: Release builds with asserts enabled (#8925) 3 years ago
Charles Pigott 591ea9862d
Codechange: Suppress warnings when asserts are disabled (#8916) 3 years ago
Charles Pigott 64b1c70fdd Codechange: Add WARN_FORMAT to vseprintf and fix the cascade of warnings that followed 4 years ago
Charles Pigott 5f86e1a390 Codechange: Silence -Wclass-memaccess warnings with GCC8 6 years ago
frosch 062c736437 (svn r27896) -Fix: some warnings 7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
rubidium 771dcf3b7b (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 10 years ago
rubidium 3c85109c49 (svn r26842) -Codechange [Squirrel]: other simple cases of non-initialised instance variables 10 years ago
rubidium 22fc96ad6b (svn r26839) -Fix [Squirrel]: some dead code and making switch fall throughs more explicit 10 years ago
rubidium 9b0c01e9bf (svn r26781) -Codechange [Squirrel]: remove includes/definitions that are already in stdafx.h 10 years ago
rubidium 9543f4ed1e (svn r26778) -Codechange: remove pointless rsl macro 10 years ago
rubidium eb52e65bec (svn r26777) -Codechange: use safe string functions in squirrel code as well, and prevent using the ones that are deemed unsafe 10 years ago
rubidium e63ca12ab8 (svn r26775) -Cleanup [Squirrel]: "resolve" several of the unicode wrapper defines 10 years ago
rubidium 33ab505567 (svn r26774) -Cleanup [Squirrel]: remove _SC macro 10 years ago
rubidium 8e87ae9120 (svn r26609) -Fix: compile warnings on MSVC for 32 bits builds due to assigning values to variables with smaller integer size 10 years ago
rubidium 39e90ec6e0 (svn r26584) -Codechange: [Squirrel] Make the internal integer for scripts always 64 bits, so scripts behave the same on 32 or 64 bits architectures 10 years ago
rubidium 2d459b2fc0 (svn r25585) -Fix [FS#5320]: [Squirrel] Stack overflow did not show an error, due to the stack to throw the error already being full 11 years ago
rubidium 124f0fc7a3 (svn r24970) -Fix [FS#5346]: crash when infinite loop occured during loading a script 11 years ago
yexo 8f36e70e35 (svn r23496) -Fix: [Squirrel] Provide a proper error message when the _cmp meta-function doesn't return an integer 13 years ago
truebrain 0c2bbdde5c (svn r23383) -Update: bring Squirrel to 2.2.5; besides some nice bug fixes, it mostly solves the sort() issues 13 years ago
rubidium 4f87d2e88c (svn r23194) -Codechange: don't cast away const needlessly 13 years ago
rubidium 92da292fbc (svn r20162) -Fix [FS#3954]: integer comparison failed in case the difference was more than "MAX_UINT"/2 14 years ago
frosch c07c7a3818 (svn r18832) -Fix: some indentation whitespace. 15 years ago
rubidium 9574371e53 (svn r18639) -Update: Squirrel from 2.2.3 to 2.2.4
-Revert (r17273): this fix is included in Squirrel 2.2.4
15 years ago
rubidium afc7f576f7 (svn r17515) -Fix [FS#3189]: [Squirrel] In some cases the call stack would not be cleaned up properly during crash handling. Occasionally this causes asserts to be triggered or crashes. 15 years ago
rubidium 5607a610d7 (svn r17403) -Fix [Squirrel]: guard against squirrel stack overflows; if assert is enabled assert (catch possible overflow bugs in nightlies/RCs), otherwise just increase the stack's size (don't get into invalid reads/writes in releases) 15 years ago
rubidium 4ac4c28a3b (svn r17284) -Fix [Squirrel]: stack was not always cleared properly with tail recursion 15 years ago
yexo f9c18ccc48 (svn r17273) -Fix [Squirrel]: calling a function that has default parameters with not enough parameters can cause a crash 15 years ago
yexo 03d711add3 (svn r17195) -Update: squirrel to 2.2.3 stable 15 years ago
yexo 9db1f5925c (svn r16532) -Fix [Squirrel]: Don't copy an object when we just checked that the pointer to it is NULL 15 years ago
yexo 9bd64cf588 (svn r16454) -Fix (r16181, r16241): fix the try/catch bug fixed in r16181 and reintroduced in r16241 again, this time without breaking the regression test. 15 years ago
rubidium 168ae6f7e2 (svn r16422) -Codechange: use const_cast for removing const and warn when const is (accidentally?) removed using C-style casts. 15 years ago
rubidium bb121a1510 (svn r16241) -Fix (r16181): regression failing due to wrongly initialised amount of traps 15 years ago
yexo e41886e78f (svn r16181) -Fix [Squirrel]: the traps variable wasn't restored, causing try/catch blocks to be 'forgotten' during a suspend. 15 years ago
rubidium 1ad50ce4e6 (svn r15578) -Change: unexternalise squirrel. 15 years ago