Commit Graph

47209 Commits

Author SHA1 Message Date
Anonymissimus
d3d0400ed0 revert part of 2011-09-08T19:16:01Z!thonsew@yahoo.com (resonless change to [item] behavior) 2011-09-27 23:01:26 +00:00
Anonymissimus
6e750eefb6 change a macro from a recent revision of mine to a function 2011-09-27 22:51:13 +00:00
Simon Forsyth
7ab65825bc Use large swamp image around swamp castle/keeps 2011-09-27 22:38:56 +00:00
Simon Forsyth
ff70dc022b Fix cannot find terrain/.png error when placing hidden forest/hill terrains 2011-09-27 22:16:37 +00:00
Simon Forsyth
1ee5f7f2a4 Do not draw encampment keep around dwarf keep 2011-09-27 21:40:13 +00:00
Ignacio R. Morelle
3c063befb5 Move the "could not initialize joystick" message to the correct stream 2011-09-27 02:28:54 +00:00
Simon Forsyth
f58e557220 Merge some flag-setting rules for terain transitions 2011-09-27 01:28:18 +00:00
Mark de Wever
b4d927e967 Strip trailing whitespace. 2011-09-26 20:27:15 +00:00
Mark de Wever
ffe42f4ca1 Fix a compilation issue in c++0x mode.
Adds extra constructors to the coordinate class to avoid narrowing
conversions, which are no longer allowed in c++0x.
2011-09-26 20:27:09 +00:00
Mark de Wever
c26c07b18c Fix a compilation issue in c++0x mode. 2011-09-26 20:27:05 +00:00
Mark de Wever
789bc09769 Fix a compilation issue in c++0x mode. 2011-09-26 20:27:02 +00:00
Mark de Wever
eba8f75669 Fix a compilation issue in c++0x mode. 2011-09-26 20:26:58 +00:00
Thonsew
f1ab44d74b Changed. In the wesnoth pretty printers I changed...
...the default number of levels of recursion when printing configs to
2.  I also fixed printing of pointers to attribute_values.
2011-09-26 19:58:08 +00:00
Thonsew
1432676b55 Fixed In UtBS::2 a 1 based random array index was being created.
I changed it to a 0 based random index.
2011-09-26 19:58:02 +00:00
Thonsew
e39c4700ec Fixes variable indices should default to [0] if absent or unitinialized.
If the variable index is absent it now defaults to 0.

This fixes bug #18728.  It might also fix all FOREACH and lua while
loops as Gambit described but I need to double check.
2011-09-26 19:57:56 +00:00
Thonsew
6800b6633c Fix bug #18703:
(if race uses name instead of male_name its name doesn't show up.)

I corrected the use of z_name as a default when neither z_male_name
nor z_female_name are presented.  We now have race names below unit
names in the side_bar for non-gendered units like Wose and ships.
Perhaps the problem only occured for wooden units?
2011-09-26 19:57:50 +00:00
Thonsew
f8d09dfc1a Fixes #bug 18715
(Game hangs at loading screen after flushing caches and save index and
pressing F5)

Previously, when the .cache/wesnoth directory was deleted, while
wesnoth was running and then the cache was refreshed with F5 from the
startup screen, wesnoth hung.  The crash occured because wesnoth
didn't recreate the cache directory after startup, when it is
recovering from the cache not existing.  Now it makes a new cache
directory as needed.
2011-09-26 19:57:44 +00:00
Thonsew
4032239276 Changed/restored behavior of config::attribute_value...
...when assigned "" an empty string.

Previously the attribute became EMPTY which caused problems in lua
which always expects a string in gmatch.  It still reports an
attribute equal to "" as empty, but its type has been changed to TOKEN
so that is returns the string "" to lua.  This fixes bug #18727 (in
part), bug #18667.
2011-09-26 19:57:38 +00:00
Fabian Müller
044afdea7b Hack to make eclipse-cdt parse the boost foreach construct...
...like the C++0x / C++11 for loop.
2011-09-26 16:50:56 +00:00
Anonymissimus
94a5382f38 fixes changelog entry for [event]remove=yes|no feature
(which was the reason for the previous bug (fix))
2011-09-26 13:18:03 +00:00
Anonymissimus
105e40b6df set buffering to false upon clearing event handlers...
...when the event manager is destroyed

(for the first scenario it's initialized to false too)
2011-09-26 13:17:47 +00:00
Anonymissimus
6a736a68c2 killed a now useless intermediate function 2011-09-26 13:17:32 +00:00
Anonymissimus
e5289c9d32 refactored when (and when not) buffering of added events is done
(fix for bug #18695 and bug #18737)

The reason for the bug was that buffering was activated and deacticated
at wrong times.

Events added (or removed) during the current event call stack do not
have effect until the base event has run out. The code previously to
adding the [event]id= feature behaved this way and it is now (again)
this way. Although it's still not exactly clear to me *why* this
buffering is done, adding event handlers which were just added during
the current call stack already to the active ones (FR bug #18713)
would require modifying the array of active handlers withint the same
loop where we are iterating over it, which is always a problematic
thing, and this in an area where every mistake quickly results in
fatal WML engine bugs...

This should be subject to further testing with scenarios featuring
complicated event structure envolving custom events, [fire_event]s,
event ids and removing of events.

The reason for me not being able to reproduce with my testcase was
that I didn't have shroud enabled. ;)

The reason for me being able to reproduce only sometimes was (I think) that
originally, buffering was initialized with random data so it sometimes
delayed the preload event and sometimes it worked correctly.
2011-09-26 13:17:16 +00:00
Anonymissimus
0324a88d09 add an event handler log domain and lots of related debug messages 2011-09-26 13:17:01 +00:00
Anonymissimus
acf7ec421e debugger-friendly formatting of class t_event_handlers 2011-09-26 13:16:44 +00:00
Simon Forsyth
fda28f8864 Revert 2010-07-31T15:18:13Z!me@jwbjerk.com
The pillars need to cover the spaces between the hexes

This is easier than moving all pillars manually

Also, the shift up didn't seem to improve the appearance of any
particular terrain combination
2011-09-25 17:35:37 +00:00
Ignacio R. Morelle
779c00052b Line-wrap author names in the add-on description dialog (bug #18691) 2011-09-25 16:31:44 +00:00
Ignacio R. Morelle
8b3be61770 Preselect the current theme in the selector dialog instead of abusing the dialog instructions label 2011-09-25 16:09:34 +00:00
Ignacio R. Morelle
3b8693153f Made it possible to switch themes before entering a game...
...or campaign (bug #10969)

I'm really not sure why this limitation was in place. Perhaps there was
an architectural constraint back when it was introduced making it
impossible to know about global [theme] nodes right after startup.

My testing indicates this doesn't have any ridiculous side-effects.
2011-09-25 15:56:23 +00:00
Steven Panek
3fe6db6e5b Updated the Old English translation. 2011-09-24 21:52:48 +00:00
Thonsew
786d6c0d67 Fix for bug #18665, bug load index not being rebuilt.
Restored correct behavior of inserting configs for saves that are
missing index enties.
2011-09-24 19:03:28 +00:00
Thonsew
6711f50f1a Fix for bug #18716 Some recruited/spawned units are slowed on creation.
Units with non-standard attributes were converting those atributes to
an integer, which the attribute_value::to_int function was converting
to 0, which unit::set_state interpreted as STATE_SLOW.  Changed it to
passing a t_token.
2011-09-24 19:03:22 +00:00
Thonsew
6b330e2e41 Fixed bug #18680 Plague no longer works
...by changing a comparison from z_empty to z_null.
Removed an unused reference to poison string.
2011-09-24 19:03:16 +00:00
Thonsew
96d5e7a88b Fixed some copying of gender attributes to copy attribute instead of token 2011-09-24 19:03:09 +00:00
Steven Panek
fcc6f2e95d Killed instance of the singular 'they'. 2011-09-24 18:03:19 +00:00
Simon Forsyth
efb70e1f54 Remove unneeded keys from singlehex macro 2011-09-24 12:02:12 +00:00
Anonymissimus
cecafe973a changelog entry
Yup, as a campaign author using the dev version...

...I feel annoyed by this and it works most of them time anyway.
2011-09-24 01:01:39 +00:00
Anonymissimus
689909fb40 added option from previous revision to the UI 2011-09-24 01:01:23 +00:00
Anonymissimus
0d2a0dff9a add an option to advanced preferences for disabling...
...the "This save is from a different version" - dialog
2011-09-24 01:00:27 +00:00
Ignacio R. Morelle
7b206781ba Fix a GUI2 warning...
...for mixing horizontal_grow and horizontal_alignment by commenting
out the latter

> error gui/parse: horizontal_grow and horizontal_alignment can't be
combined, alignment is ignored.
2011-09-24 00:51:05 +00:00
Simon Forsyth
7658a8db18 Further castle transition smoothing
Fixes most problems with the tall encampment keep (e.g. it now looks
correct beside normal encampment keep)

Some keeps now connect like castles - no base transitions though
2011-09-24 00:31:34 +00:00
Simon Forsyth
53b693bc6c Make more castle-other castle transitions work
Encampment is now default if no other match

Likely there are still some that should be something other than
encampment
2011-09-23 23:42:10 +00:00
Simon Forsyth
94ab2521f1 Improve water to off-map transition - border is no longer sharp.
Still needs a longer smoother image to match quality of deep water
2011-09-23 23:01:28 +00:00
Simon Forsyth
f2b4eb2eff Expand GENERIC_SINGLEHEX_PLFB into TERRAIN_BASE_PLFB and variants
Allows the single-hex macro to be used without directly accessing the
internal macros

terrain-graphics.cfg updated to use non-internal macros

Satisfies comment at start of internal-* files
2011-09-23 22:11:59 +00:00
Simon Forsyth
ad9a382658 Move image tag inside tile. Fixes appearance part of buf 18723 2011-09-23 21:47:21 +00:00
Simon Forsyth
7c8adba978 Simplify ANIMATED_WATER_15 macro (aka remove references to adjacent tiles) 2011-09-23 21:39:51 +00:00
Simon Forsyth
a58b8ec108 Simplify GENERIC_SINGLEHEX_PLFB. Macro is currently unused in mainline 2011-09-23 20:59:26 +00:00
Nils Kneuper
6d3958bd65 updated Indonesian translation 2011-09-23 20:35:39 +00:00
Fabian Müller
c64fd57a77 Fixed widescreen theme on low resolutions.
Added tod support on the left sidebar.
2011-09-23 20:29:13 +00:00
Steven Panek
f00de9fe69 Gave dwarf in troll guards in the seventh scenarios unique ids. 2011-09-23 18:50:42 +00:00