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
|
4 months ago |
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
4 months ago |
Jonathan G Rennison
|
55d78a23be
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/include/squirrel.h
# src/blitter/32bpp_sse_func.hpp
# src/bridge_map.h
# src/clear_map.h
# src/company_manager_face.h
# src/console_func.h
# src/core/bitmath_func.hpp
# src/core/endian_func.hpp
# src/core/random_func.hpp
# src/depot_map.h
# src/elrail_func.h
# src/fontcache.h
# src/industry_map.h
# src/map_func.h
# src/newgrf_spritegroup.h
# src/object_map.h
# src/rail.h
# src/rail_map.h
# src/road_func.h
# src/road_map.h
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/settings_gui.cpp
# src/sl/oldloader.h
# src/sprite.h
# src/spritecache.h
# src/station_func.h
# src/station_map.h
# src/story_base.h
# src/strings_func.h
# src/tile_cmd.h
# src/tile_map.h
# src/tile_type.h
# src/town.h
# src/town_map.h
# src/tree_map.h
# src/tunnel_map.h
# src/tunnelbridge_map.h
# src/vehicle_func.h
# src/viewport_func.h
# src/void_map.h
# src/water.h
# src/water_map.h
# src/widget_type.h
|
5 months ago |
Rubidium
|
3a676a5af0
|
Codechange: replace static inline with static for non-class functions
|
5 months ago |
Charles Pigott
|
6fc28d649e
|
Cleanup: Unused alloca definitions and includes
|
1 year ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Charles Pigott
|
5f86e1a390
|
Codechange: Silence -Wclass-memaccess warnings with GCC8
|
6 years ago |
truebrain
|
1c9bec1999
|
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
|
13 years ago |
frosch
|
5ccd091fd1
|
(svn r22881) -Fix (r22875): GCC warnings on 64bit systems.
|
13 years ago |
michi_cc
|
f227e90c24
|
(svn r22875) -Codechange: Add some asserts and checks to better prevent overflow of the argument to malloc. (monoid)
|
13 years ago |
rubidium
|
eb299736c1
|
(svn r21886) -Codechange: move documentation towards the code to make it more likely to be updated [n].
|
14 years ago |
rubidium
|
ca91a97826
|
(svn r17579) -Fix: remove doxygen docs for removed parameters, or change @param to @tparam if necessary
|
15 years ago |
rubidium
|
7fbc33dae1
|
(svn r17248) -Fix: add GPL license notice where appropriate
|
15 years ago |
Yexo
|
0e42a7bac7
|
(svn r15291) -Cleanup: Move the station list widgets to their class from station_gui.h
-Fix: comment for ReallocT was wrong, the memory is not zeroed.
|
16 years ago |
skidd13
|
b4ef380c49
|
(svn r13607) -Fix (r13606): some coding style issues got fixed but some got/stayed broken
|
16 years ago |
skidd13
|
640e547886
|
(svn r13606) -Codechange: use "static FORCEINLINE" where possible as default for core functions (big functions use just inline instead)
|
16 years ago |
smatz
|
bd5067b5a0
|
(svn r13456) -Codechange: use AllocaM() macro instead of alloca() at most places
|
16 years ago |
smatz
|
14dc60c8a1
|
(svn r12778) -Codechange: add the NORETURN attribute to *allocError() functions
|
16 years ago |
rubidium
|
9a73b698d4
|
(svn r12695) -Codechange: only allocate window structs when needed. Based on a patch by Alberth.
|
16 years ago |
rubidium
|
8e83627991
|
(svn r12536) -Codechange: some stack allocations were too large for NDS, so use the SmallStackSafeStackAlloc wrapper. Allocate on the stack by default and on the heap for NDS (or other devices that have a very small stack).
|
16 years ago |
smatz
|
f19eca0905
|
(svn r12115) -Codechange: move malloc/realloc error messages to separate file to spare 4-8kB of binary size
|
17 years ago |
rubidium
|
59ec5e62ce
|
(svn r11943) -Codechange: add and use a simple structure to support small stacks by allocating it on the heap or pushing a few kB of data onto the stack when there is a large stack.
|
17 years ago |
rubidium
|
bf98e25e43
|
(svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed.
|
17 years ago |