866 Commits

Author SHA1 Message Date
Mark de Wever
6dab616793 Remove the sticky exception class.
All sticky exceptions are replaced with the lua jailbreak exceptions.
The code has been lightly tested, too many possibilities to test them
all. Don't expect breakage but mainly the load code looks tricky with
the global variables.
2011-03-27 20:55:35 +00:00
Mark de Wever
18bf79ef13 Remove an unused header.
Fixes a compilation problem for SDL 1.3.
2011-03-19 18:53:29 +00:00
Nils Kneuper
a4fbd98fd8 removed --smallgui from --help output...
...as well as from the manpages since it is no longer required

(some small leftovers, especially at unit tests are still there,
someone else has to test those)
2011-03-11 15:49:21 +00:00
Ignacio R. Morelle
9d48c92650 Fix loadscreen progressbar "bleeding" on the old MP lobby...
...when running with -s switch

This fixes the more general case and invokes loadscreen_manager.reset()
earlier in the sequence right before attempting to jump into gameplay.
2011-02-19 22:26:44 +00:00
Ignacio R. Morelle
bfd2176ecd Don't show error message when cancelling the wesnothd finder...
...dialog from MP menu (bug #17446)

This supresses the message whenever show_wesnothd_server_search()
returns an empty string, such as when the user clicks on Cancel. There
don't seem to be any likely cases where it can return an empty string
after clicking on OK.
2011-02-19 20:32:48 +00:00
Mark de Wever
ff422edc9c Remove the editor option.
This changes causes the editor to be always build. It also sorts the
file entries in the build systems.

loonycyborg please review the scons changes.
2011-02-19 12:25:05 +00:00
Mark de Wever
ec0eb48ead Let twml_exception no longer derive from a base.
This how I originally designed the class and how it should behave. This

reverts 2011-01-26T07:30:35Z!guillaume.melquiond@gmail.com and reintroduces bug #17577. There are two
issues when used in combination with Lua:

 - Our Lua wrapper crashes when catching this exception (to be fixed in my next
   commit.)

 - When our Lua wrapper no longer crashes the error message is lost. (I have an
   idea how to fix it, but it is much easier to test when this change is
   committed.)
2011-02-16 18:59:46 +00:00
Guillaume Melquiond
f6e5953933 Reverted 2011-01-08T20:40:28Z!koraq@xs4all.nl. (Fix for bug #17577.) 2011-01-26 07:30:35 +00:00
Ignacio R. Morelle
8dd4bffd7c Game controller: process [color_range] and [color_palette] at the WML root
This allows add-ons to use these nodes at top-levels to define custom
ranges and palettes for the game engine. I'm not sure yet whether this
is the most elegant way to do this -- might consider filtering
[game_config] before 1.9.5.
2011-01-25 00:45:00 +00:00
Guillaume Melquiond
57a1ddfd05 Changed -d option so that it forcefully enables debug mode...
...in multiplayer games, as requested in bug #17412.
2011-01-23 14:36:54 +00:00
Mark de Wever
c770e4add1 Remove an unused variable.
Code should have been removed in 2010-08-27T18:07:55Z!koraq@xs4all.nl. Fixes a g++ 4.6 warning.
2011-01-16 09:49:11 +00:00
Mark de Wever
acba693447 Fix a bug not showing the twml_exception dialog.
When called from lua the dialog was no longer show, but only the user
part of the message. (Fixes bug #17405.)
2011-01-08 20:40:28 +00:00
Mark de Wever
ecbabea838 New year copyright update. 2011-01-01 15:57:50 +00:00
Alexander van Gessel
d5d59e71d2 Refactor the [language] loading a bit 2010-12-30 16:47:33 +01:00
Alexander van Gessel
eba2f27676 Ensure that all [language] blocks are loaded properly 2010-12-30 00:22:31 +01:00
Guillaume Melquiond
939eb12553 Disabled debug mode when entering the multiplayer lobby,
...but allowed to enable it later if wesnoth was started in mp_debug
mode. (Fix for bug #17412.)
2010-12-29 20:25:51 +00:00
Guillaume Melquiond
0188250ece Fixed game configuration not being reset when starting a new game. 2010-12-28 19:49:07 +00:00
Alexander van Gessel
532ff83ef2 Un-hardwire the [language] block in data/hardwired/english.cfg.
Move the file out of that dir
2010-12-27 11:27:15 +01:00
Mark de Wever
d8b025e716 Add a new debug clock dialog.
The dialog is used to test the drawing routines. The clock will need
some appearance changes later on. It's main goal is to test the drawing
routine timing and several other things I want to test in the near
future, where I want to see what parts get updated.
2010-12-26 17:07:48 +00:00
Ignacio R. Morelle
883ed19525 Fix --data-dir 2010-12-09 21:13:41 +00:00
Ignacio R. Morelle
4379c471dc Convert campaign difficulty selection dialog to GUI2
Changelog entries pending. May need wmllint changes.
2010-11-15 20:25:09 +00:00
Guillaume Melquiond
091dda6dbd Avoided costly copy. 2010-10-30 22:50:45 +00:00
Ignacio R. Morelle
60fb547be5 Return non-zero from main() in two exception cases 2010-10-24 21:11:48 +00:00
Mark de Wever
2df6e82a8d Move title screen results to title screen dialog.
Might move later again after deciding how to handle automatic
assignment of named buttons.
2010-10-16 19:53:41 +00:00
Guillermo Biset
ad2ab627ab Added support to allow a client to connect through a proxy...
...(using no authentication or basic, see
http://www.ietf.org/rfc/rfc2617.txt). Use it via command line options
--proxy, --proxy-address, --proxy-port, --proxy-user and
--proxy-password. All these options are undocumented yet and for
testing purposes at the moment, please feel free to document them
(check the comments in the new methods in network.hpp.) Example use:
./wesnoth --proxy-address localhost --proxy-port 8888 --proxy-user
billy --proxy-password MYPWD.
2010-09-24 06:56:18 +00:00
Guillermo Biset
773b3bf38f Fix a TODO in network_ana.cpp.
The queue_disconnect invocation should hold the same logic as a
standard disconnect in the current implementation (after reading
comments for queue_disconnect in network.hpp.) I also added some
command line options to game.cpp (commented at the moment) that will
help implement support for connection trhough proxy.
2010-09-22 18:49:11 +00:00
Guillaume Melquiond
3c5f031cf1 Fixed compilation with disabled editor. (Patch by vigg.) 2010-09-20 06:55:13 +00:00
Ali El Gariani
f2547a6ade Allow to use F5 in editor mode (may ask to save maps before restart)
Working enough to be useful but still need to polish various things.
2010-09-17 15:34:53 +00:00
Steven Panek
d784c34fd2 Applied file #10184 from patch #1926 with modifications. 2010-09-12 04:20:34 +00:00
Fabian Müller
2597618ab3 The --debug commandline switch sets the WML debug domain to level 3
(which is also called "debug").
2010-09-05 09:26:57 +00:00
Ali El Gariani
9334ca28a2 Fix "text box send hotkeys" bug...
...(reported in bug #16578 GUI2 titlescreen change)

2010-08-29T10:48:19Z!koraq@xs4all.nl added this line but I don't see its purpose for GUI2. I
keep it but made it specific to GUI2 titlescreen, since it was not
needed by the main game before.
2010-09-04 16:55:15 +00:00
Ali El Gariani
8957943582 Fix reload issues after the GUI2 titlescreen change (bug #16578)
(caused by the weird code of game.cpp)
2010-09-02 20:15:42 +00:00
Guillaume Melquiond
eeb047de55 Fixed file headers so that they match the content of the COPYING file. 2010-09-01 21:12:38 +00:00
Mark de Wever
b21f23db09 Remove duplicate definitions of string_map.
Issue spotted by cppcheck.
2010-08-29 20:13:31 +00:00
Mark de Wever
1aac317bf5 Remove an unneeded include in a header. 2010-08-29 10:48:31 +00:00
Mark de Wever
615f7a57ad Remove the unused parts of the title screen code.
After switching to gui2 most code is no longer needed the rest needs a
review whether it needs here or move to the gui2 code.
2010-08-29 10:48:26 +00:00
Mark de Wever
4ab5f57d4f Switched the title screen to gui2 code. 2010-08-29 10:48:19 +00:00
Mark de Wever
7a27f99716 Removed the statitics upload code. 2010-08-27 18:07:55 +00:00
Jérémy Rosen
3d15c2fc34 reimplement the defines properly 2010-08-20 19:12:11 +00:00
Jérémy Rosen
70d5c0e9d9 While i'm at it, add a USE_TINY_GUI preprocessor define 2010-08-20 18:32:00 +00:00
Jérémy Rosen
5b9a2ec2b8 add a LOW_MEM define accessible to WML preprocessor,
...defined when the binary was compiled with LOW_MEM
2010-08-20 18:16:42 +00:00
Nils Kneuper
6648dec952 add missing \n in --help output 2010-08-18 14:48:46 +00:00
Ali El Gariani
cd60975287 Clarify --help and manpage about recent changes of --logdomains 2010-08-16 01:10:49 +00:00
Timotei Dolean
492007c305 make '--preprocess' gain 90% more speed by processing...
...just files that contain macro definitions
2010-08-14 08:50:08 +00:00
Guillaume Melquiond
b8d6286dbd Factorized and generalized the loadscreen progress counter.
The bar should now accurately reflect the loading time, and therefore
regularly progress.

The magic values are automatically generated in the 'loadscreen' log
domain and can be copy-pasted in the code if the current ones become
off.
2010-08-10 12:08:24 +00:00
Guillaume Melquiond
0a996b70d5 Added function for splicing children between config objects.
This speeds up configuration loading by 50%.
2010-08-09 15:57:32 +00:00
Ali El Gariani
30c52fc7c5 Safer window-icon handling.
Kill set_wm_icon function, since SDL_WM_SetIcon can be called safely
only at one place. Clearly hardcode the image's url instead of
pretending that we use game_config. Rename the image to
"game-icon.png" (since you are forced to use it).
2010-08-08 18:33:48 +00:00
Ali El Gariani
112ecf8dde Temporarily revert 2010-08-04T03:22:04Z!alinkmaze@gmail.com...
...and only use the hardcoded application icon

(SDL_WM_SetIcon weirdly segfault)
2010-08-08 17:59:01 +00:00
Ali El Gariani
b8f642874c Fix bug #16377 (Main map broken if campaign has no difficulties)
This also fix a bug where campaign without difficulty was contaminated
by the difficulty define of other campaign. This at least caused
caches multiplication.
2010-08-07 17:39:35 +00:00
Alexander van Gessel
e177c3da3d Make (mapgen|io|editor)_exception inherit from game::error,
...rather than std::exception
2010-08-07 00:57:46 +01:00