57784 Commits

Author SHA1 Message Date
Chris Beck
92fbce248b add doxygen comments to recall_list_manager.hpp 2014-06-24 21:31:27 -04:00
Chris Beck
f9a02e0b23 add doxygen comments to fake_unit_ptr.?pp 2014-06-24 21:25:13 -04:00
Chris Beck
c319e27bb0 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-24 21:07:47 -04:00
Chris Beck
f88de7f5d0 add doxygen comments to unit_animation_component.hpp 2014-06-24 21:07:28 -04:00
Ignacio R. Morelle
6629fdf64e wesnothd: Only reset the commands FIFO stream when reloading if needed
May or may not fix the issue noted in commit
62eb55a5a712b3e2157cf7fc0bb12873c4f0a574 regarding the SIGHUP handler,
which is in charge of scheduling load_config() to run. Rather
unfortunately, I'm unable to reproduce the issue on my own machine, so
I'll have to take this to production and test it live.
2014-06-24 20:47:58 -04:00
Ignacio R. Morelle
46815ee008 campaignd: Document send_message/send_error's WML output and side-effects 2014-06-24 20:44:26 -04:00
Ignacio R. Morelle
efcf8f7b6a campaignd: Reject bad requests with an [error] block
This can be used to signal campaignd clients in the future about
features that aren't yet implemented.

As with the previous change to using find() to locate a request handler,
this only applies to the first WML child of the request's root node.
Other nodes continue to be ignored.
2014-06-24 20:39:11 -04:00
Ignacio R. Morelle
df54918c36 campaignd: Use find() to locate a request handler
Makes it so for each request received we use
request_handlers_table::find() instead of a plain linear search to find
the handler, using the tag name of the first WML child node we can find,
instead of trying to locate one with a known handler id.

In theory this allows taking advantage of the request_handlers_table
type's (currently a std::map) own lookup mechanism.
2014-06-24 20:39:11 -04:00
Ignacio R. Morelle
6b8e42dfe2 campaignd: Add a typedef for the handlers map 2014-06-24 20:39:11 -04:00
Ignacio R. Morelle
6c5e9e37e0 campaignd: Print the destination IP in the send_error() call 2014-06-24 20:39:11 -04:00
Chris Beck
0982d9dc58 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-24 20:38:50 -04:00
Chris Beck
6ec86c98a2 fixup 0f5876fe38067c9783f41ab769e485dd8705e30e
There was a small mistake here: The unit constructor
which takes a unit type first and 3 other parameters,
has the 4th one being an optional gender, and the
third a bool. fake_unit had a constructor mapping to
this, which sets the third to false. I over looked
this when factoring out fake_unit, but it only
generates a warning to cast enum to bool on MSVC
compilers.
2014-06-24 20:37:11 -04:00
gfgtdf
e13775f31e remove mp_game_settings::share_view/maps
This is a leftover from 1.0 where this was adjustable in a dialog. This
is not the case anymore, the current behavior results in
[side]share_view= always being true in mp which just means we have one
less option for mp scenario designers.
Even worse, the previous behavior results in share_view always being
false for scenarios in mp campaign that are not the first scenario,
regardless of the settings in the scenario.
2014-06-25 02:07:30 +02:00
Ignacio R. Morelle
806ed31b9f gui2/tgame_cache_options: Add wiki documentation 2014-06-24 19:34:29 -04:00
gfgtdf
d3392cdee5 add comment 2014-06-24 23:41:08 +02:00
gfgtdf
97c1178e02 commented out unneeded code 2014-06-24 23:36:40 +02:00
Chris Beck
9757a2d267 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-24 17:21:37 -04:00
Chris Beck
d583b3e401 add game_state::to_config 2014-06-24 17:18:53 -04:00
Chris Beck
15352a24e8 move some initializing from play_controller to game_state 2014-06-24 16:54:49 -04:00
Chris Beck
bcb39542c5 tweaks to play_controller::init
moved game_events manager init earlier
moved place_sides_in_preferred_locations to game_state
2014-06-24 16:08:23 -04:00
Nathan Walker
6270674847 Fixed scoping in multiplayer commandline load
As AI0867 pointed out, config object references were available after they had been made invalid by reloading
2014-06-24 14:55:19 -05:00
ln-zookeeper
6144517825 Updated bigmap credits 2014-06-24 22:47:51 +03:00
Chris Beck
e85c37e161 remove unused member (dead code) 2014-06-24 15:44:08 -04:00
Chris Beck
30a443d12f move game_state to its own file 2014-06-24 15:36:58 -04:00
Chris Beck
3d6f2d7821 add game_state class, separate from play_controller 2014-06-24 15:22:55 -04:00
Chris Beck
bd9fb6914c change saved_game name to saved_game_ in play_controllers 2014-06-24 14:17:17 -04:00
Chris Beck
b51d6a15d1 rename gamestatus.?pp -> game_data.?pp, b/c of content changes 2014-06-24 13:44:25 -04:00
Chris Beck
cf2651b5a7 rename drawable_unit.?pp -> unit_drawer.?pp, b/c of new contents 2014-06-24 13:22:13 -04:00
Chris Beck
663494f661 move teambuilder to its own file 2014-06-24 13:12:29 -04:00
Chris Beck
f9b32d375e Merge pull request #221 from aquileia/VC_update
Fix openMP build
2014-06-24 03:43:11 -04:00
aquileia
939af32e69 Fix openMP build
Tested to compile on VC12 with openMP activated.

With two loops over the same unit list, 'guided' scheduling (as done
before the second loop was introduced) isn't optimal.

[ci skip]
2014-06-24 06:01:13 +02:00
Turuk
6698f59e25 DM 07: Objective Change/DM 10: Add Ghast to [role] 2014-06-23 21:39:10 -04:00
Turuk
9af0b83de2 Altered objectives to reflect carryover bonus.
Player destroying standing stones would give the bonus, but the
objectives indicated otherwise.
2014-06-23 21:27:50 -04:00
gfgtdf
bc26958d06 readd mp_game_title key
to servergenerated replaysaves.

idk where its used but i was told that readding it is a good idea.
2014-06-24 01:24:02 +02:00
gfgtdf
c1aead6776 assign correct scopes to old SCOPE_GENERAL hotkeys 2014-06-23 23:54:40 +02:00
gfgtdf
6b8a39d933 fix a possible segfault in hotkey preferences dialog
selected_command_ might be -1 causing symbols["hotkey_description"] =
hotkey::get_description((*commands)[selected_command_]); to fail.

and remove a "case hotkey::SCOPE_COUNT: ..." which for forgotten in a
previous commit
2014-06-23 23:54:38 +02:00
gfgtdf
daaf8bd2f5 fixup hotkeys preferences display 2014-06-23 23:54:37 +02:00
Alexander van Gessel
0286032dd2 Remove non-existent unit ID from filter
Spotted by necrosporus.
2014-06-23 23:10:41 +02:00
Chris Beck
1526066e22 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-23 12:57:27 -04:00
Chris Beck
34a7454696 restore openmp parallelization in display.cpp
This was removed in 4a997873485a6be4b511ea11241ec0349c8410fc
2014-06-23 12:55:01 -04:00
Chris Beck
4bb55f4ab8 make fake_unit_manager foreachable, drop the "range" getter 2014-06-23 12:45:46 -04:00
Alexander van Gessel
e2e82e88b6 Merge pull request #215 from gfgtdf/hotkey_scopes
Hotkey scopes
2014-06-23 18:01:47 +02:00
Chris Beck
c1f3af2cbd Merge branch 'fake_unit_ptr' 2014-06-23 11:18:56 -04:00
Chris Beck
0f5876fe38 change fake_unit class to fake_unit_ptr
This is consistent with the introduction of the UnitPtr class.
fake_units really aren't different from units, the only difference
is their life time / allocation and ownership. Since we are trying
to use reference counting for all units (to make them safe to use
with animations), the fake units need to be managed by a reference
counted pointer also. This is the easiest way to achieve that.

I also remove some odd code the [move_units_fake] handler --
there was explicit code to remove the fake units from the fake
unit manager, but this is redundant as it is the responsibility
of the destructor.

Code Blocks and VC project files are updated, but
Code::Blocks Scons and Xcode are not.
2014-06-23 11:17:55 -04:00
Alexander van Gessel
54e0bd92c9 Prevent infinitely recursive macros (bug #20126)
We simply use the system already in place for file inclusions, and bump the
limit up to 100 to appease compulsive macro users.
2014-06-23 17:00:08 +02:00
Paweł Jackowski
ed06d2526f Two Brothers: Polish translation update
Two Brothers: Polish translation update, updates delivered by Wesbane.
2014-06-23 02:51:24 +01:00
Charles Dang
04098fd82a Merge pull request #217 from AlainODea/grammar_tut1_victory
Grammar: missing preposition in tutorial 1 victory
2014-06-23 12:37:04 +11:00
Nathan Walker
be366af523 Implemented defines for largest mainline scenarios 2014-06-22 15:37:53 -05:00
Nathan Walker
b53461e075 Fixed reloading for commandline mp 2014-06-22 15:33:48 -05:00
Nathan Walker
99b3bd2699 Add define functionality to modifications.
Added a new method, void create_engine::prepare_for_era_and_mods(),
which sets era and mod in game classification.
Prepare_for_[scenario, campaign] then set their respective defines and reload.

Conflicts:
	changelog
	src/gamestatus.cpp
	src/gamestatus.hpp
2014-06-22 15:33:36 -05:00