Commit Graph

436 Commits

Author SHA1 Message Date
Jonathan G Rennison
2b38268e2f Add printf format codes for 64-bit unsigned integers 2017-10-05 18:20:29 +01:00
frosch
24a1b82840 (svn r27916) -Codechange: Enable usage of static_assert for MSVC 2017-09-24 13:35:27 +00:00
Jonathan G Rennison
4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	config.lib
2017-09-04 01:22:54 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
Jonathan G Rennison
f3a0aace0c Merge branch 'master' into cpp-11
# Conflicts:
#	src/stdafx.h
2017-08-15 18:44:17 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
a8e0862500 Enable prefetch and bswap buitins for clang. 2016-09-08 20:00:56 +01:00
Jonathan G Rennison
34040b694c Make use of override unconditional. 2016-09-08 19:47:59 +01:00
Jonathan G Rennison
8ad53acfef Merge branch 'crashlog_improvements' into jgrpp 2016-09-08 19:41:53 +01:00
Jonathan G Rennison
f7774415f2 Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	src/stdafx.h
2016-09-08 19:36:00 +01:00
Jonathan G Rennison
390a22f864 Enable FINAL, (un)linkely, __attribute__ for clang. 2016-09-08 18:38:53 +01:00
Jonathan G Rennison
5e67582a64 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
2016-09-07 22:02:57 +01:00
Jonathan G Rennison
bb6ea150a3 Use likely/__builtin_expect for assertion macros.
(cherry picked from commit f82002cda2)
2016-09-05 22:46:01 +01:00
Jonathan G Rennison
0b7d68a6d1 Add support for verbose asserts.
(cherry picked from commit 48e4c35fdc)
2016-09-05 22:46:01 +01:00
Jonathan G Rennison
51099c3572 Unconditionally use static_assert. 2016-09-05 22:46:01 +01:00
Jonathan G Rennison
def24030a4 Merge branch 'crashlog_improvements' into jgrpp 2016-03-10 00:17:43 +00:00
Jonathan G Rennison
f82002cda2 Use likely/__builtin_expect for assertion macros. 2016-03-10 00:13:58 +00:00
Jonathan G Rennison
5dba89c783 Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	source.list
#	src/openttd.cpp
#	src/stdafx.h
#	src/vehicle.cpp
2016-02-17 22:56:15 +00:00
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.
2016-02-17 22:41:07 +00:00
Jonathan G Rennison
48e4c35fdc Add support for verbose asserts.
Use for test/exec DoCommand mismatches.
2016-02-17 22:41:07 +00:00
Jonathan G Rennison
155987a4aa Fix override being used on gcc 4.3 to 4.6. 2016-01-08 17:01:37 +00:00
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.
2015-12-17 20:45:33 +00:00
Jonathan G Rennison
19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-08-11 21:41:58 +01:00
Jonathan G Rennison
388dab7390 Merge branch 'master' into enhanced_viewport_overlay
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
2015-08-11 21:41:41 +01:00
michi_cc
35b77450f8 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 2015-08-10 20:21:29 +00:00
michi_cc
0cd198c798 (svn r27380) -Fix: [Win32] Compilation with MSVC2015. 2015-08-10 20:21:29 +00:00
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
2015-08-05 21:54:11 +01:00
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
2015-08-05 21:24:30 +01:00
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.
2015-08-01 17:06:42 +01:00
rubidium
f0924bb910 (svn r27109) -Fix (r27102): MinGW compilation 2015-01-02 19:50:43 +00:00
rubidium
889780adce (svn r27109) -Fix (r27102): MinGW compilation 2015-01-02 19:50:43 +00:00
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 2015-01-01 20:50:43 +00:00
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 2015-01-01 20:50:43 +00:00
fonsinchen
0affe0e119 (svn r27040) -Fix: Don't use GCC diagnostic push/pop if unsupported 2014-10-25 12:32:42 +00:00
fonsinchen
28bd8a3d83 (svn r27040) -Fix: Don't use GCC diagnostic push/pop if unsupported 2014-10-25 12:32:42 +00:00
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. 2014-09-25 20:45:25 +00:00
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. 2014-09-25 20:45:25 +00:00
rubidium
95549e6da5 (svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD 2014-09-06 17:30:33 +00:00
rubidium
7c4e9dd71d (svn r26771) -Cleanup: remove OTTD2SQ and SQ2OTTD 2014-09-06 17:30:33 +00:00
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 2014-09-06 17:20:45 +00:00
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 2014-09-06 17:20:45 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
baa9dd4b5d (svn r26500) -Cleanup: remove unused snprintf implementation 2014-04-24 18:40:16 +00:00
rubidium
99452c51ce (svn r26500) -Cleanup: remove unused snprintf implementation 2014-04-24 18:40:16 +00:00
zuu
35a2435b9d (svn r26226) -Fix (r26212): Compilation in visual studio 2008 failed 2014-01-05 10:15:57 +00:00
zuu
998049a618 (svn r26226) -Fix (r26212): Compilation in visual studio 2008 failed 2014-01-05 10:15:57 +00:00
planetmaker
b67933bd4d (svn r26223) -Codechange: Silence some compile warnings about unititialized variables in the SSE blitters (MJP) 2014-01-03 18:43:10 +00:00
planetmaker
7b20da8a0a (svn r26223) -Codechange: Silence some compile warnings about unititialized variables in the SSE blitters (MJP) 2014-01-03 18:43:10 +00:00