Commit graph

1020 commits

Author SHA1 Message Date
Celtic Minstrel
1816e1147f Remove asserts.hpp
This file seemed to be some sort of reimplementation of <cassert> except
with some "feature" of trying to force the debugger to hit a breakpoint.
However, any decent debugger already hits a breakpoint with a standard
assert(), and this file really only served to make it harder to see the
actual error when using a Windows console.

Some instances of these macros were replaced with assert(), others with
VALIDATE() which instead throws an exception (and possibly puts up a
dialog, if the exception is caught before main()).

A few other related changes that got mixed in:
- Several error conditions now have a better error message (or indeed
  any error message at all)
- Removed an unnecessary use of std::distance on a Boost iterator range.
- Removed a large chunk of code which did nothing but construct a widget
  builder and then crash; the code was unreachable since an earlier loop
  did the same thing (without crashing), and the comment seems to suggest
  that it was a (seemingly no longer necessary) workaround for some buggy
  compilers / linkers.
- noreturn added to the list of compatibilty C++11 features in global.hpp
  (Of supported compilers, only VC12 lacks the new [[attribute]] syntax.)
- Fix detection of GCC in global.hpp

# Conflicts:
#	src/gui/widgets/settings.cpp
2016-09-18 15:57:47 -04:00
Jyrki Vesterinen
42c3435c0c Update Visual Studio project 2016-09-15 20:52:29 +03:00
loonycyborg
c16adcd8c9 Merge branch 'campaignd_asio' 2016-09-15 16:34:09 +03:00
Charles Dang
1fb26d9e1c Convert remaining SDL1.2 defines to their SDL2 counterparts and dropped compat layer 2016-09-15 15:55:09 +11:00
Celtic Minstrel
d0b8b471c5 Add campaignd target to XCode project
It builds and links, but won't work properly without an implementation
for async_send_file
2016-09-13 14:18:52 -04:00
Celtic Minstrel
404c6ca754 Fix XCode wesnothd build 2016-09-13 13:14:11 -04:00
Celtic Minstrel
3dba60bcd7 Update Visual Studio project 2016-09-12 09:45:02 -04:00
Celtic Minstrel
e90a256489 Update XCode project 2016-09-11 17:05:20 -04:00
Charles Dang
d0cae514ff Added basic GUI2 end credits dialog (incomplete) 2016-09-11 18:55:38 +11:00
Celtic Minstrel
e3ab484f5e Update XCode project 2016-09-10 21:46:08 -04:00
Celtic Minstrel
ab6369098f Remove *.vcxproj.user files
While they did contain settings that are required for Wesnoth to run
correctly in the Visual Studio debugger, these settings can also be
specified in the main project file (even if only by manually editing
the XML).

Including the *.user files is problematic since it also includes things
that a developer may wish to frequently change, such as command-line
arguments.

Thus, the settings have been moved into the main project file.
2016-09-09 17:17:53 -04:00
Celtic Minstrel
8a80af4c69 Update XCode project 2016-09-08 17:36:20 -04:00
Celtic Minstrel
0d47ea2522 Update Visual Studio project 2016-09-08 17:29:53 -04:00
Charles Dang
b07810608a Renamed the mp_chatbox widget simply "chatbox" 2016-09-09 08:25:04 +11:00
Charles Dang
7950fafba6 Updated CB projectfile 2016-09-09 07:23:09 +11:00
Charles Dang
ba81174ade Updated CB projfile 2016-09-07 10:48:26 +11:00
Celtic Minstrel
8d6e513671 Fix XCode warnings and add missing header ref 2016-09-06 18:48:14 -04:00
Celtic Minstrel
e3346fec78 Update XCode, scons, CMake 2016-09-06 18:26:39 -04:00
Celtic Minstrel
0180a72573 Fix lots of warnings in MSVC12
Some explanations:
- savepng uses setjmp, so I changed it to C; this guarantees that someone does not accidentally introduce a C++ object in it (unlikely though that is)
- The loop in multiplayer.cpp seemed intended to allow the command-line to request repeated plays, so the break was removed rather than refactoring it to an if statement
- Some uninitialized structs were changed to be zero-initialized
- Use luaW_toboolean instead of lua_toboolean
- Needed explicit constructor for vconfig iterators, since their only member is const
2016-09-06 17:55:00 -04:00
Celtic Minstrel
84e1f4ba4d MSVC: Ignore truncated type name warnings 2016-09-06 16:30:01 -04:00
JaMiT
d46a327029 Missing file, moved files, and alphabetical order 2016-09-05 00:42:03 -05:00
Charles Dang
7c663bc0a9 Added an helper function for creating bound status labels 2016-09-05 14:34:59 +11:00
Jyrki Vesterinen
357cbfe35a Update Visual Studio project 2016-09-03 18:08:00 +03:00
Celtic Minstrel
473076104c Update XCode project 2016-09-03 01:43:49 -04:00
Charles Dang
56e8222bb0 Converted Generator Settings dialog to GUI2 2016-09-03 12:41:29 +11:00
Jyrki Vesterinen
fa89aed9e7 Update Visual Studio project 2016-09-02 21:08:47 +03:00
Celtic Minstrel
ac7508d427 Revert "XCode: Use address sanitizer in debug builds"
This reverts commit 60d543cf3b.

Unfortunately, it seems that the address sanitizer cannot find its lib,
and I am not sure how to fix that, so I will have to revisit this at
a later time.
2016-09-01 23:17:56 -04:00
Charles Dang
423fc10437 CodeBlocks: explicitly added -Wunused-parameter flag 2016-09-02 09:56:07 +11:00
Celtic Minstrel
60d543cf3b XCode: Use address sanitizer in debug builds 2016-09-01 18:35:40 -04:00
Celtic Minstrel
9bc92e657b Update XCode project 2016-09-01 18:33:16 -04:00
Charles Dang
faed98a651 Added standalone options configuration dialog for GUI2 2016-09-02 09:28:30 +11:00
Celtic Minstrel
6bd2e67f26 Update XCode project 2016-09-01 17:15:51 -04:00
Charles Dang
725df26dd2 MP Create: split options handling into a helper class
This is so the same code can be used for an option-only configure dialog in SP.
2016-09-02 03:23:04 +11:00
mattsc
dedb51d2f2 Another Xcode project update 2016-08-31 20:14:25 -07:00
mattsc
c296a67990 Update Xcode project 2016-08-31 19:38:10 -07:00
Celtic Minstrel
d9111620bd Update XCode project 2016-08-31 20:59:38 -04:00
Wedge009
6ae79eaed6 Updating VC project files. 2016-08-29 17:20:00 +10:00
Celtic Minstrel
24111e7a73 Update XCode projet 2016-08-29 01:05:02 -04:00
Charles Dang
507d00d9d9 Refactored out wmi_pager
This is no longer needed after switching right-click menus to GUI2, since they have built-in
scrolling capability. This also removes the max_wml_menu_items preference.
2016-08-29 15:38:52 +11:00
Charles Dang
2bffd4af56 Convert Select Faction (FLG) dialog to GUI2 2016-08-29 05:33:15 +11:00
Jyrki Vesterinen
8838486591 Update Visual Studio project 2016-08-25 19:23:00 +03:00
Celtic Minstrel
a0350198c3 MP Lobby / Create: Yield to plugins 2016-08-24 16:45:27 -04:00
Celtic Minstrel
7084eee8a7 Fixup XCode project for PR 744 2016-08-24 16:22:45 -04:00
Charles Dang
b570c56354 Updated build files for PR 744 2016-08-25 00:44:07 +11:00
Wedge009
9b98734400 Updating VC project files for merge of PR #744. 2016-08-24 17:43:45 +10:00
Celtic Minstrel
e821e508c3 Merge pull request #744 from lua_refactor
Refactor some Lua stuff and reduce const_cast usage

Conflicts:
	src/scripting/game_lua_kernel.cpp
	src/scripting/lua_unit.cpp
2016-08-24 03:13:38 -04:00
Wedge009
872e2e45ad Tidying VC project files. 2016-08-23 16:22:07 +10:00
Charles Dang
14752e1bdb Updated CB projectfile 2016-08-23 10:52:17 +11:00
Celtic Minstrel
396f5dfc4c Rename combobox -> menu_button 2016-08-22 19:37:14 -04:00
Jyrki Vesterinen
f79b707dc4 Merge pull request #751 from jyrkive/wesnothd-msvc
Make wesnothd build with Visual Studio
2016-08-22 21:57:36 +03:00