0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Thibault Févry 2015-03-28 17:15:13 +01:00
commit 9382393f74
11 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/tools/unit_tree/update-wmlunits
View file

@ -43,11 +43,11 @@ make -C $BUILD mo-update > /dev/null 2>&1
rm -f $DIR/overview.txt
echo DOWNLOADING
$TOOLS/wesnoth_addon_manager -p $PORT -d '.*' -c $ADDONS > $LOG/wesnoth_addon_manager.txt 2>&1 &&
$TOOLS/wesnoth_addon_manager -p $PORT -d '.*' -c $ADDONS > $LOG/wesnoth_addon_manager.txt 2>&1
echo WORKING
python -u $TOOLS/wmlunits -t $TRANS -D $DATA -o $TMPOUT -w $EXE -C $CONFIG -a $ADDONS -L $DIR/overview.txt -B $DIR/overview.txt -T $TIMEOUT > $LOG/wmlunits.txt 2>&1 &&
python -u $TOOLS/wmlunits -t $TRANS -D $DATA -o $TMPOUT -w $EXE -C $CONFIG -a $ADDONS -L $DIR/overview.txt -B $DIR/overview.txt -T $TIMEOUT > $LOG/wmlunits.txt 2>&1
test -f $TMPOUT/mainline/en_US/mainline.html
rsync -vaz --delete $TMPOUT/ $OUT > $LOG/rsync.txt 2>&1 &&
rm -rf $TEMP/* &&
rsync -vaz --delete $TMPOUT/ $OUT > $LOG/rsync.txt 2>&1
rm -rf $TEMP/*
rm -rf $TMPOUT

1
data/tools/wmlunits
View file

@ -540,7 +540,6 @@ if __name__ == '__main__':
global options
global image_collector
global TIMEOUT
ap = argparse.ArgumentParser()
ap.add_argument("-C", "--config-dir",

2
src/addon/manager_ui.hpp
View file

@ -36,7 +36,7 @@ bool manage_addons(display& disp);
* it's dependencies. Launches gui dialogs when issues arise.
*
* @param disp Display object on which to render UI elements.
* @param id The id of the target add-on.
* @param addon_ids The ids of the target add-on.
*
* @return @a true when we successfully installed the target (possibly the user chose to ignore failures)
*/

3
src/game_data.cpp
View file

@ -54,9 +54,6 @@ game_data::game_data(const config& level)
, can_end_turn_(level["can_end_turn"].to_bool(true))
, next_scenario_(level["next_scenario"])
{
if(!level["playing_team"].empty()) {
phase_ = INITIAL_RELOAD;
}
}
game_data::game_data(const game_data& data)

3
src/game_data.hpp
View file

@ -68,7 +68,6 @@ public:
rand_rng::mt_rng& rng() { return rng_; }
enum PHASE {
INITIAL_RELOAD,
INITIAL,
PRELOAD,
PRESTART,
@ -78,7 +77,7 @@ public:
PHASE phase() const { return phase_; }
void set_phase(PHASE phase) { phase_ = phase; }
bool is_reloading() const { return phase_ == INITIAL_RELOAD; }
bool allow_end_turn() const { return can_end_turn_; }
void set_allow_end_turn(bool value) { can_end_turn_ = value; }

15
src/image_modifications.cpp
View file

@ -548,6 +548,14 @@ const SDL_Color& background_modification::get_color() const
namespace {
struct parse_mod_registration
{
parse_mod_registration(const char* name, mod_parser parser)
{
mod_parsers[name] = parser;
}
};
/** A macro for automatic modification parser registration
*
* It automatically registers the created parser in the mod_parsers map
@ -557,13 +565,6 @@ namespace {
* @param type The modification type to be registered (unquoted)
* @param args_var The name for the string argument provided
*/
struct parse_mod_registration
{
parse_mod_registration(const char* name, mod_parser parser)
{
mod_parsers[name] = parser;
}
};
#define REGISTER_MOD_PARSER(type, args_var) \
static modification* parse_##type##_mod(const std::string&); \
static parse_mod_registration parse_##type##_mod_registration_aux(#type, &parse_##type##_mod); \

6
src/play_controller.cpp
View file

@ -134,6 +134,7 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
, statistics_context_(new statistics::scenario_context(level["name"]))
, undo_stack_(new actions::undo_list(level.child("undo_stack")))
, replay_(new replay(state_of_game.get_replay()))
, loading_game_(!level["playing_team"].empty())
, player_number_(level["playing_team"].to_int() + 1)
, start_turn_(gamestate_.tod_manager_.turn()) // gamestate_.tod_manager_ constructed above
, skip_replay_(skip_replay)
@ -325,7 +326,8 @@ void play_controller::fire_start()
gamestate_.gamedata_.set_phase(game_data::PLAY);
}
void play_controller::init_gui(){
void play_controller::init_gui()
{
gui_->begin_game();
gui_->update_tod();
}
@ -1008,7 +1010,7 @@ void play_controller::start_game()
{
fire_preload();
if(!resources::gamedata->is_reloading())
if(!loading_game_)
{
resources::recorder->add_start_if_not_there_yet();
resources::recorder->get_next_action();

3
src/play_controller.hpp
View file

@ -272,6 +272,9 @@ protected:
boost::scoped_ptr<actions::undo_list> undo_stack_;
boost::scoped_ptr<replay> replay_;
/// if a team is specified whose turn it is, it means we're loading a game instead of starting a fresh one.
bool loading_game_;
int player_number_;
unsigned int start_turn_;
bool skip_replay_;

2
src/scripting/lua_common.hpp
View file

@ -83,7 +83,7 @@ void luaW_pushconfig(lua_State *L, config const &cfg);
/**
* Converts an optional table or vconfig to a config object.
* @param tstring_meta absolute stack position of t_string's metatable, or 0 if none.
* @param index absolute stack position of t_string's metatable, or 0 if none.
* @return false if some attributes had not the proper type.
* @note If the table has holes in the integer keys or floating-point keys,
* some keys will be ignored and the error will go undetected.

2
src/sdl/image.hpp
View file

@ -74,7 +74,7 @@ public:
* Render the texture on a specified target, with respect to the previously
* set rotation, coloring etc.
*
* @param target The target to draw onto.
* @param video The target to draw onto.
* @param x Where to draw (x coordinate).
* @param y Where to draw (y coordinate).
*/

4
src/sdl/utils.hpp
View file

@ -201,8 +201,8 @@ surface scale_surface_nn(const surface & surf, int w, int h);
* @retval surf Returned if w == surf->w and h == surf->h
* note this ignores the optimize flag.
*/
surface scale_surface(const surface &surf, int w, int h);
surface scale_surface(const surface &surf, int w, int h, bool optimize /*=true*/);
surface scale_surface(const surface &surf, int w, int h);
//commenting out the default parameter so that it is possible to make function pointers to the 3 parameter version
/** Scale a surface (legacy (1.10, 1.12) version)
@ -215,8 +215,8 @@ surface scale_surface(const surface &surf, int w, int h, bool optimize /*=true*/
* @retval surf Returned if w == surf->w and h == surf->h
* note this ignores the optimize flag.
*/
surface scale_surface_legacy(const surface &surf, int w, int h);
surface scale_surface_legacy(const surface &surf, int w, int h, bool optimize /*=true*/);
surface scale_surface_legacy(const surface &surf, int w, int h);
//commenting out the default parameter so that it is possible to make function pointers to the 3 parameter version
/** Scale a surface using modified nearest neighbour algorithm. Use only if