Joe Stringer
66c32533ec
Fix: [Cygwin] Fix missing definitions in stdafx
...
Fix the following compile errors:
In file included from openttd/src/debug.h:15:0,
from openttd/src/string.cpp:13:
openttd/src/cpu.h:35:19: error: 'uint' was not declared in this scope
bool HasCPUIDFlag(uint type, uint index, uint bit);
openttd/src/string.cpp: In function 'char* strcasestr(const char*, const char*)':
openttd/src/string.cpp:548:7: error: 'strncasecmp' was not declared in this scope
if (strncasecmp(haystack, needle, needle_len) == 0) return const_cast<char *>(haystack);
openttd/src/strgen/strgen_base.cpp: In function 'void EmitPlural(Buffer*, char*, int)':
openttd/src/core/alloc_func.hpp:136:6: error: 'alloca' was not declared in this scope
(T*)alloca((num_elements) * sizeof(T)))
Signed-off-by: Joe Stringer <joe@wand.net.nz>
5 years ago
glx22
49f3592ac9
Fix: vcpkg used to patch lzma.h to define LZMA_API_STATIC for static builds ( #7614 )
...
(cherry picked from commit 846fc8fe09
)
5 years ago
Jonathan G Rennison
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
glx22
846fc8fe09
Fix: vcpkg used to patch lzma.h to define LZMA_API_STATIC for static builds ( #7614 )
5 years ago
glx22
19a6829ea2
Fix #7553 : check bounds when loading strings ( #7554 )
...
(cherry picked from commit cef9a76c3f
)
5 years ago
glx22
cef9a76c3f
Fix #7553 : check bounds when loading strings ( #7554 )
5 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Jonathan G Rennison
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
6 years ago
Michael Lutz
baf9229931
Codechange: Replace AutoDeleteSmallVector with direct std::vector use in text layout code.
6 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
6 years ago
Patric Stout
72c5f2b3ee
Remove: DOS support
...
In 10 years there was no active development on DOS. Although it
turned out to still work, the FPS was very bad. There is little
interest in the current community to look into this.
Further more, we like to switch to c++11 functions for threads,
which are not implemented by DJGPP, the only current compiler
for DOS.
Additionally, DOS is the only platform which does not support
networking. It is the reason we have tons of #ifdefs to support
disabling networking.
By removing DOS support, we can both use c++11 functions for threads,
and remove all the code related to disabling network. Sadly, this
means we have to see DOS go.
Of course, if you feel up for the task, simply revert this commit,
and implement stub c++11 functions for threads and stub functions
for networking. We are more than happy to accept such Pull Request.
6 years ago
Jonathan G Rennison
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
6 years ago
Patric Stout
1c5ea33099
Fix: warnings when compiling for a recent version of Haiku
...
This might break older Haiku versions, but it is hard to tell.
6 years ago
Patric Stout
f58db44ff2
Remove: BeOS support (deprecated by Haiku)
...
In 10 years there is no commit to change how BeOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), BeOS is no longer
support. SDL2 suggests to use Haiku instead of BeOS.
6 years ago
Patric Stout
ad30d04b5e
Codechange: removed some left-behind __NDS__ references
6 years ago
Patric Stout
7784d77713
Remove: MorphOS / AmigaOS support
...
In 10 years there is no commit to change how MorphOS works, and we
have no active maintainer for it. It is unlikely it works in its
current state (but not impossible).
With the arrival of SDL2 (and removal of SDL), MorphOS is no longer
support. There is an SDL2 port for MorphOS, but it is not maintained
by upstream SDL2, and nobody can currently test it out.
If anyone wants to re-add MorphOS, please do (revert this patch,
fix the problems, and create a Pull Request). If you need any help
doing so, let us know! It is not that we don't like MorphOS, it is
that we don't have anyone fixing the problems :(
6 years ago
Jonathan G Rennison
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
glx
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
glx
3be6ab555c
Change: use vcpkg integration in Visual Studio
...
Removes the need for us to provide OpenTTD-useful package
6 years ago
Jonathan G Rennison
5661763d6a
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
Jonathan G Rennison
7f027f8dca
Add tile info dump function and assert variants
6 years ago
Jonathan G Rennison
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
6 years ago
Charles Pigott
63898f61b0
Codechange: Rearrange struct packing defines and make MinGW use _Pragma pack style
6 years ago
Jonathan G Rennison
fd4d9591c1
Merge branch 'save_ext' into jgrpp
6 years ago
Jonathan G Rennison
f05ca1ba91
Merge branch 'cpp-11' into save_ext
6 years ago
Jonathan G Rennison
183a5cb114
Add unaligned uint 16, 32, 64 typedefs
6 years ago
Jonathan G Rennison
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
Jonathan G Rennison
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
7 years ago
Patric Stout
aef69443e7
Remove: WinCE support
7 years ago
Patric Stout
85adde7485
Remove: PSP support
7 years ago
Jonathan G Rennison
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
7 years ago
Charles Pigott
dd6b82d6b2
Codechange: Simplify C++11 check for assert_compile
7 years ago
Jonathan G Rennison
a93cc441a9
Merge branch 'cpp-11' into jgrpp
7 years ago
Jonathan G Rennison
2b38268e2f
Add printf format codes for 64-bit unsigned integers
7 years ago
frosch
24a1b82840
(svn r27916) -Codechange: Enable usage of static_assert for MSVC
7 years ago
Jonathan G Rennison
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
Jonathan G Rennison
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
Jonathan G Rennison
a8e0862500
Enable prefetch and bswap buitins for clang.
8 years ago
Jonathan G Rennison
34040b694c
Make use of override unconditional.
8 years ago
Jonathan G Rennison
8ad53acfef
Merge branch 'crashlog_improvements' into jgrpp
8 years ago
Jonathan G Rennison
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
Jonathan G Rennison
390a22f864
Enable FINAL, (un)linkely, __attribute__ for clang.
8 years ago
Jonathan G Rennison
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison
bb6ea150a3
Use likely/__builtin_expect for assertion macros.
...
(cherry picked from commit f82002cda2
)
8 years ago
Jonathan G Rennison
0b7d68a6d1
Add support for verbose asserts.
...
(cherry picked from commit 48e4c35fdc
)
8 years ago
Jonathan G Rennison
51099c3572
Unconditionally use static_assert.
8 years ago
Jonathan G Rennison
def24030a4
Merge branch 'crashlog_improvements' into jgrpp
9 years ago
Jonathan G Rennison
f82002cda2
Use likely/__builtin_expect for assertion macros.
9 years ago
Jonathan G Rennison
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
9 years ago
Jonathan G Rennison
5cf2b04f6a
Initial implementation of scope guard logging for including in crash logs.
...
This adds a mechanism to create scope guards with an associated std::function
which is called to output diagnostic info in the event of a crash.
Add a macro to make it easy to efficiently capture variables on the stack
and output a formatted message.
Requires C++11, #ifdefed out for legacy compilers.
9 years ago
Jonathan G Rennison
48e4c35fdc
Add support for verbose asserts.
...
Use for test/exec DoCommand mismatches.
9 years ago
Jonathan G Rennison
155987a4aa
Fix override being used on gcc 4.3 to 4.6.
9 years ago
Jonathan G Rennison
d00fa4d25b
Implement a 32bpp SSE2 palette animator. This is ~4x faster than 32bpp-anim's.
...
Create a new blitter mode: 32bpp-sse2-anim, which is 32bpp-anim + this.
32bpp-sse2-anim is now used by default where 32bpp-anim would have been.
Also use this with the 32bpp-sse4-anim blitter mode.
Fix memory leak in current 32bpp animated blitters.
9 years ago
Jonathan G Rennison
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
Jonathan G Rennison
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
michi_cc
35b77450f8
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
9 years ago
michi_cc
0cd198c798
(svn r27380) -Fix: [Win32] Compilation with MSVC2015.
9 years ago
Jonathan G Rennison
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
patch-import
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison
0b09a7ac61
Add a conditional define for the override keyword.
...
Use of the override keyword can prevent various types of problems when
the base method signature is changed, but derived overriding methods are
not. This is conditional to maintain compatibility with legacy compilers.
9 years ago
rubidium
f0924bb910
(svn r27109) -Fix (r27102): MinGW compilation
10 years ago
rubidium
889780adce
(svn r27109) -Fix (r27102): MinGW compilation
10 years ago
rubidium
978d4e4eaa
(svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer
10 years ago
rubidium
730773f5f1
(svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer
10 years ago
fonsinchen
0affe0e119
(svn r27040) -Fix: Don't use GCC diagnostic push/pop if unsupported
10 years ago
fonsinchen
28bd8a3d83
(svn r27040) -Fix: Don't use GCC diagnostic push/pop if unsupported
10 years ago
frosch
049c7dba29
(svn r26922) -Fix: Include strings.h on HAIKU for strcasecmp. Some platforms do not have a strings.h at all, most define the functions in string.h as well.
10 years ago
frosch
9d209829eb
(svn r26922) -Fix: Include strings.h on HAIKU for strcasecmp. Some platforms do not have a strings.h at all, most define the functions in string.h as well.
10 years ago
rubidium
95549e6da5
(svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD
10 years ago
rubidium
7c4e9dd71d
(svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD
10 years ago
rubidium
e874be7691
(svn r26769) -Codechange [Squirrel]: remove the difference between some platforms having wchar for SQChar and others just char; always use char (and UTF-8) like in the rest of (internal) OpenTTD
10 years ago
rubidium
7a00d2e849
(svn r26769) -Codechange [Squirrel]: remove the difference between some platforms having wchar for SQChar and others just char; always use char (and UTF-8) like in the rest of (internal) OpenTTD
10 years ago
rubidium
034735a54c
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
11 years ago
rubidium
9ed12b0f07
(svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL)
11 years ago
rubidium
baa9dd4b5d
(svn r26500) -Cleanup: remove unused snprintf implementation
11 years ago
rubidium
99452c51ce
(svn r26500) -Cleanup: remove unused snprintf implementation
11 years ago
zuu
35a2435b9d
(svn r26226) -Fix (r26212): Compilation in visual studio 2008 failed
11 years ago
zuu
998049a618
(svn r26226) -Fix (r26212): Compilation in visual studio 2008 failed
11 years ago
planetmaker
b67933bd4d
(svn r26223) -Codechange: Silence some compile warnings about unititialized variables in the SSE blitters (MJP)
11 years ago
planetmaker
7b20da8a0a
(svn r26223) -Codechange: Silence some compile warnings about unititialized variables in the SSE blitters (MJP)
11 years ago
michi_cc
b2d68431d5
(svn r25677) -Codechange: [Win32] There are no 64-bit Windows versions below XP and we can safely assume it as the target platform.
11 years ago
michi_cc
b96ef5c758
(svn r25677) -Codechange: [Win32] There are no 64-bit Windows versions below XP and we can safely assume it as the target platform.
11 years ago
michi_cc
66d9ded71f
(svn r25674) -Fix: [Win32] The console code page for non-Unicode builds is not the normal ANSI code page and definitely not UTF-8 either.
11 years ago
michi_cc
e3648455aa
(svn r25674) -Fix: [Win32] The console code page for non-Unicode builds is not the normal ANSI code page and definitely not UTF-8 either.
11 years ago
michi_cc
49988bc599
(svn r25128) -Codechange: [Win32] MSVC 2010 comes with stdint.h.
12 years ago
michi_cc
8ce21bb1c0
(svn r25128) -Codechange: [Win32] MSVC 2010 comes with stdint.h.
12 years ago
frosch
1644cd08b4
(svn r24926) -Fix [FS#5373]: Check integer min/max macros individually, and define them if missing.
12 years ago
frosch
f73e43818c
(svn r24926) -Fix [FS#5373]: Check integer min/max macros individually, and define them if missing.
12 years ago
michi_cc
44f9260ad4
(svn r24782) -Codechange: [Win32] Disable MSVC warning about using 'this' in a base member initializer list as we don't use it in any problematic way.
12 years ago
michi_cc
2caa80f751
(svn r24782) -Codechange: [Win32] Disable MSVC warning about using 'this' in a base member initializer list as we don't use it in any problematic way.
12 years ago
michi_cc
5bea1b3007
(svn r24416) -Fix [FS#5231]: [Win32] Unbreak NewGRF MD5 sum calculation. Macros and side effects don't mix, especially if there's some obscure '#define min' in a windows header that nobody thinks of.
12 years ago
michi_cc
1792c186c7
(svn r24416) -Fix [FS#5231]: [Win32] Unbreak NewGRF MD5 sum calculation. Macros and side effects don't mix, especially if there's some obscure '#define min' in a windows header that nobody thinks of.
12 years ago
truebrain
aa1a0053b0
(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
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
smatz
36747f96a6
(svn r23588) -Codechange: use the 'final' keyword so compiler can optimise out some indirect calls
13 years ago
smatz
33d283fdb1
(svn r23588) -Codechange: use the 'final' keyword so compiler can optimise out some indirect calls
13 years ago
rubidium
33d71b45fe
(svn r23198) -Codechange: introduce a free that takes const pointers so we don't need to cast to void/non-const before being able to free
13 years ago