[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src actions.cpp ai_attack.cpp cursor.cp...
|
From: |
ott |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/src actions.cpp ai_attack.cpp cursor.cp... |
|
Date: |
Tue, 06 Sep 2005 09:53:14 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: ott <address@hidden> 05/09/06 13:53:14
Modified files:
src : actions.cpp ai_attack.cpp cursor.cpp
filesystem.cpp font.cpp game.cpp intro.cpp
multiplayer.cpp multiplayer_connect.cpp
multiplayer_create.cpp multiplayer_lobby.cpp
multiplayer_lobby.hpp network_worker.cpp
playlevel.cpp playturn.cpp thread.cpp
thread.hpp
Log message:
codeclean
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.239&tr2=1.240&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai_attack.cpp.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cursor.cpp.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.151&tr2=1.152&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.276&tr2=1.277&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/intro.cpp.diff?tr1=1.83&tr2=1.84&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.164&tr2=1.165&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.cpp.diff?tr1=1.155&tr2=1.156&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_create.cpp.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.hpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.215&tr2=1.216&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.396&tr2=1.397&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/thread.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/thread.hpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.239 wesnoth/src/actions.cpp:1.240
--- wesnoth/src/actions.cpp:1.239 Sat Aug 27 22:24:10 2005
+++ wesnoth/src/actions.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.239 2005/08/27 22:24:10 gruikya Exp $ */
+/* $Id: actions.cpp,v 1.240 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -86,7 +86,7 @@
}
}
-bool can_recruit_on(const gamemap& map, const gamemap::location& leader, const
gamemap::location loc)
+bool can_recruit_on(const gamemap& map, const gamemap::location& leader, const
gamemap::location loc)
{
if(!map.on_board(loc))
return false;
Index: wesnoth/src/ai_attack.cpp
diff -u wesnoth/src/ai_attack.cpp:1.65 wesnoth/src/ai_attack.cpp:1.66
--- wesnoth/src/ai_attack.cpp:1.65 Sun Aug 28 19:55:20 2005
+++ wesnoth/src/ai_attack.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: ai_attack.cpp,v 1.65 2005/08/28 19:55:20 Sirp Exp $ */
+/* $Id: ai_attack.cpp,v 1.66 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -454,7 +454,7 @@
const int xp_for_advance = att->second.max_experience()
- att->second.experience();
- //the reward for advancing a unit is to get a
'negative' loss of that unit
+ //the reward for advancing a unit is to get a
'negative' loss of that unit
if(att->second.type().advances_to().empty() == false) {
if(xp >= xp_for_advance) {
avg_losses -= att->second.type().cost();
@@ -467,7 +467,7 @@
//it by a quarter of the unit cost.
This will cause the AI
//to heavily favor getting xp for
close-to-advance units.
avg_losses -=
(att->second.type().cost()*xp)/(xp_for_advance*4);
- }
+ }
}
if(defhp <= 0) {
@@ -494,7 +494,7 @@
//penalty for allowing advancement is a 'negative' kill, and
//defender's hitpoints get restored to maximum
- if(defend_it->second.type().advances_to().empty() == false &&
+ if(defend_it->second.type().advances_to().empty() == false &&
defend_it->second.experience() <
defend_it->second.max_experience() &&
defend_it->second.experience() + defenderxp >=
defend_it->second.max_experience()) {
Index: wesnoth/src/cursor.cpp
diff -u wesnoth/src/cursor.cpp:1.18 wesnoth/src/cursor.cpp:1.19
--- wesnoth/src/cursor.cpp:1.18 Sat Aug 27 18:27:04 2005
+++ wesnoth/src/cursor.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: cursor.cpp,v 1.18 2005/08/27 18:27:04 gruikya Exp $ */
+/* $Id: cursor.cpp,v 1.19 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003-5 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -42,7 +42,7 @@
}
//the width must be a multiple of 8 (SDL requirement)
-
+
#ifdef __APPLE__
size_t cursor_width = 16;
#else
@@ -63,9 +63,9 @@
Uint8 r,g,b,a;
Uint8 trans = 0;
Uint8 black = 0;
-
+
const size_t index = y*cursor_width + x;
-
+
if (x < cursor_width) {
SDL_GetRGBA(pixels[y*nsurf->w +
x],nsurf->format,&r,&g,&b,&a);
@@ -73,12 +73,12 @@
trans = (a < 128 ? 0 : 1) << shift;
black = (trans == 0 || (r+g+b)/3 > 128 ? 0 : 1)
<< shift;
-
+
data[index/8] |= black;
mask[index/8] |= trans;
}
-
+
}
}
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.78 wesnoth/src/filesystem.cpp:1.79
--- wesnoth/src/filesystem.cpp:1.78 Mon Sep 5 14:03:13 2005
+++ wesnoth/src/filesystem.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.78 2005/09/05 14:03:13 Sirp Exp $ */
+/* $Id: filesystem.cpp,v 1.79 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -319,7 +319,7 @@
//this deletes a directory with no hidden files and subdirectories
//also deletes a single file
-bool delete_directory(const std::string& path)
+bool delete_directory(const std::string& path)
{
bool ret = true;
std::vector<std::string> files;
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.151 wesnoth/src/font.cpp:1.152
--- wesnoth/src/font.cpp:1.151 Tue Aug 9 21:43:20 2005
+++ wesnoth/src/font.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.151 2005/08/09 21:43:20 j_daniel Exp $ */
+/* $Id: font.cpp,v 1.152 2005/09/06 13:53:14 ott Exp $ */
/* vim:set encoding=utf-8: */
/*
Copyright (C) 2003 by David White <address@hidden>
@@ -153,7 +153,7 @@
}
}
}
-
+
} else {
name = "fonts/" + fname;
if(!file_exists(name)) {
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.276 wesnoth/src/game.cpp:1.277
--- wesnoth/src/game.cpp:1.276 Mon Sep 5 14:27:30 2005
+++ wesnoth/src/game.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.276 2005/09/05 14:27:30 Sirp Exp $ */
+/* $Id: game.cpp,v 1.277 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -929,15 +929,15 @@
}
//add negative sizes to reverse the sort order
- sizes.push_back(-atoi((**i)["size"].c_str()));
-
- const int max_icon_dim = 80;
-
- //make sure the icon isn't too big
- std::string icon = (**i)["icon"];
- const surface icon_img =
image::get_image(icon,image::UNSCALED);
- if(icon_img.null() == false && icon_img->w >
max_icon_dim && icon_img->h > max_icon_dim) {
- icon = "";
+ sizes.push_back(-atoi((**i)["size"].c_str()));
+
+ const int max_icon_dim = 80;
+
+ //make sure the icon isn't too big
+ std::string icon = (**i)["icon"];
+ const surface icon_img =
image::get_image(icon,image::UNSCALED);
+ if(icon_img.null() == false && icon_img->w >
max_icon_dim && icon_img->h > max_icon_dim) {
+ icon = "";
}
options.push_back(IMAGE_PREFIX + icon +
COLUMN_SEPARATOR +
Index: wesnoth/src/intro.cpp
diff -u wesnoth/src/intro.cpp:1.83 wesnoth/src/intro.cpp:1.84
--- wesnoth/src/intro.cpp:1.83 Mon Sep 5 19:07:21 2005
+++ wesnoth/src/intro.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: intro.cpp,v 1.83 2005/09/05 19:07:21 gruikya Exp $ */
+/* $Id: intro.cpp,v 1.84 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -229,10 +229,10 @@
bool skip = false, last_key = true;
- const SDL_Rect total_size = font::draw_text(NULL, screen_area(),
font::SIZE_PLUS,
+ const SDL_Rect total_size = font::draw_text(NULL, screen_area(),
font::SIZE_PLUS,
font::NORMAL_COLOUR, story, 0, 0);
if (texty + total_size.h > screen_area().h) {
- texty = screen_area().h > total_size.h + 1 ? screen_area().h -
total_size.h - 1 : 0;
+ texty = screen_area().h > total_size.h + 1 ? screen_area().h -
total_size.h - 1 : 0;
draw_solid_tinted_rectangle(textx, texty, total_size.w,
total_size.h,
0, 0, 0, 128, video.getSurface());
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.164 wesnoth/src/multiplayer.cpp:1.165
--- wesnoth/src/multiplayer.cpp:1.164 Fri Aug 5 23:01:13 2005
+++ wesnoth/src/multiplayer.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.164 2005/08/05 23:01:13 j_daniel Exp $ */
+/* $Id: multiplayer.cpp,v 1.165 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -348,7 +348,7 @@
} catch(network::error& error) {
if(!error.message.empty()) {
if(error.message == _("No multiplayer
sides available in this game") ||
- error.message == _("Era not
available") ||
+ error.message == _("Era not
available") ||
error.message == _("No multiplayer
sides found")) {
gui::show_error_message(disp,
error.message);
break;
@@ -363,7 +363,7 @@
} catch(network::error& error) {
if(!error.message.empty()) {
if(error.message == _("No multiplayer
sides available in this game") ||
- error.message == _("Era not
available") ||
+ error.message == _("Era not
available") ||
error.message == _("No multiplayer
sides found")) {
gui::show_error_message(disp,
error.message);
break;
Index: wesnoth/src/multiplayer_connect.cpp
diff -u wesnoth/src/multiplayer_connect.cpp:1.155
wesnoth/src/multiplayer_connect.cpp:1.156
--- wesnoth/src/multiplayer_connect.cpp:1.155 Sun Aug 21 18:33:36 2005
+++ wesnoth/src/multiplayer_connect.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.cpp,v 1.155 2005/08/21 18:33:36 gruikya Exp $ */
+/* $Id: multiplayer_connect.cpp,v 1.156 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -946,7 +946,7 @@
level_["mp_use_map_settings"] = params_.use_map_settings ? "yes" : "no";
level_["mp_fog"] = params_.fog_game ? "yes" : "no";
level_["mp_shroud"] = params_.shroud_game ? "yes" : "no";
-
+
//this will force connecting clients to be using the same version
number as us.
level_["version"] = game_config::version;
Index: wesnoth/src/multiplayer_create.cpp
diff -u wesnoth/src/multiplayer_create.cpp:1.34
wesnoth/src/multiplayer_create.cpp:1.35
--- wesnoth/src/multiplayer_create.cpp:1.34 Sun Aug 21 18:33:37 2005
+++ wesnoth/src/multiplayer_create.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_create.cpp,v 1.34 2005/08/21 18:33:37 gruikya Exp $ */
+/* $Id: multiplayer_create.cpp,v 1.35 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -94,10 +94,10 @@
xp_modifier_slider_.set_value(preferences::xp_modifier());
xp_modifier_slider_.set_increment(10);
xp_modifier_slider_.set_help_string(_("The amount of experience a unit
needs to advance"));
-
+
use_map_settings_.set_check(preferences::use_map_settings());
use_map_settings_.set_help_string(_("Use scenario specific settings"));
-
+
fog_game_.set_check(preferences::fog());
fog_game_.set_help_string(_("Enemy units cannot be seen unless they are
in range of your units"));
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.85
wesnoth/src/multiplayer_lobby.cpp:1.86
--- wesnoth/src/multiplayer_lobby.cpp:1.85 Mon Sep 5 14:33:46 2005
+++ wesnoth/src/multiplayer_lobby.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.cpp,v 1.85 2005/09/05 14:33:46 Sirp Exp $ */
+/* $Id: multiplayer_lobby.cpp,v 1.86 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -166,9 +166,9 @@
}
if(map_data != "") {
- try {
- std::string& image_id = minimaps_[map_data];
-
+ try {
+ std::string& image_id = minimaps_[map_data];
+
if(image_id.empty()) {
gamemap map(game_config(), map_data);
const surface
mini(image::getMinimap(100,100,map,0));
@@ -177,10 +177,10 @@
std::stringstream id;
id << "addr " << mini.get();
image_id = id.str();
- image::register_image(image_id, mini);
- }
+ image::register_image(image_id, mini);
+ }
- str << "&" << image_id << COLUMN_SEPARATOR;
+ str << "&" << image_id << COLUMN_SEPARATOR;
} catch(gamemap::incorrect_format_exception& e) {
std::cerr << "illegal map: " << e.msg_ << "\n";
@@ -189,7 +189,7 @@
str << "(" << _("Shroud") << ")" << COLUMN_SEPARATOR;
}
- std::string name = (**game)["name"];
+ std::string name = (**game)["name"];
name.erase(std::remove_if(name.begin(),name.end(),font::is_format_char),name.end());
str << font::make_text_ellipsis(name, font::SIZE_NORMAL,
xscale(300));
Index: wesnoth/src/multiplayer_lobby.hpp
diff -u wesnoth/src/multiplayer_lobby.hpp:1.14
wesnoth/src/multiplayer_lobby.hpp:1.15
--- wesnoth/src/multiplayer_lobby.hpp:1.14 Sun Sep 4 15:52:17 2005
+++ wesnoth/src/multiplayer_lobby.hpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_lobby.hpp,v 1.14 2005/09/04 15:52:17 Sirp Exp $ */
+/* $Id: multiplayer_lobby.hpp,v 1.15 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -13,8 +13,8 @@
#ifndef MULTIPLAYER_LOBBY_HPP_INCLUDED
#define MULTIPLAYER_LOBBY_HPP_INCLUDED
-
-#include <map>
+
+#include <map>
#include "config.hpp"
#include "display.hpp"
@@ -63,8 +63,8 @@
lobby_sorter sorter_;
gui::menu games_menu_;
- int current_game_;
-
+ int current_game_;
+
std::map<std::string,std::string> minimaps_;
};
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.49 wesnoth/src/network_worker.cpp:1.50
--- wesnoth/src/network_worker.cpp:1.49 Mon Sep 5 20:28:28 2005
+++ wesnoth/src/network_worker.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: network_worker.cpp,v 1.49 2005/09/05 20:28:28 j_daniel Exp $ */
+/* $Id: network_worker.cpp,v 1.50 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003-5 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -486,7 +486,7 @@
remove_buffers(sock);
break;
}
-
+
if(lock_it->second != SOCKET_LOCKED) {
if(lock_it->second != SOCKET_INTERRUPT) {
sockets_locked.erase(lock_it);
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.215 wesnoth/src/playlevel.cpp:1.216
--- wesnoth/src/playlevel.cpp:1.215 Sun Sep 4 00:40:02 2005
+++ wesnoth/src/playlevel.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.215 2005/09/04 00:40:02 Sirp Exp $ */
+/* $Id: playlevel.cpp,v 1.216 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -240,7 +240,7 @@
}
LOG_NG << "initializing team...\n";
-
+
const std::string& controller = (**ui)["controller"];
if (controller == preferences::client_type() &&
(**ui)["description"] == preferences::login()) {
first_human_team = ui - unit_cfg.begin();
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.396 wesnoth/src/playturn.cpp:1.397
--- wesnoth/src/playturn.cpp:1.396 Mon Sep 5 19:05:47 2005
+++ wesnoth/src/playturn.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.396 2005/09/05 19:05:47 gruikya Exp $ */
+/* $Id: playturn.cpp,v 1.397 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -152,8 +152,8 @@
key_(key), gui_(gui), map_(map), teams_(teams), team_num_(team_num),
units_(units), browse_(mode != PLAY_TURN), allow_network_commands_(mode ==
BROWSE_NETWORKED),
left_button_(false), right_button_(false), middle_button_(false),
- minimap_scrolling_(false), enemy_paths_(false),
- last_nearest_(gamemap::location::NORTH),
+ minimap_scrolling_(false), enemy_paths_(false),
+ last_nearest_(gamemap::location::NORTH),
last_second_nearest_(gamemap::location::NORTH),
path_turns_(0), end_turn_(false), start_ncmd_(-1), textbox_(textbox),
replay_sender_(replay_sender)
{
@@ -1954,7 +1954,7 @@
if(msg.empty()) {
current_team.spend_gold(u_type->second.cost());
statistics::recruit_unit(new_unit);
-
+
clear_undo_stack();
redo_stack_.clear();
@@ -2904,9 +2904,9 @@
if(textbox_.box != NULL) {
textbox_.box->set_volatile(true);
- const SDL_Rect rect = {
- area.x + label_area.w + border_size*2, ypos,
- textbox_width, textbox_.box->height()
+ const SDL_Rect rect = {
+ area.x + label_area.w + border_size*2, ypos,
+ textbox_width, textbox_.box->height()
};
textbox_.box->set_location(rect);
}
Index: wesnoth/src/thread.cpp
diff -u wesnoth/src/thread.cpp:1.13 wesnoth/src/thread.cpp:1.14
--- wesnoth/src/thread.cpp:1.13 Sun Sep 4 14:46:36 2005
+++ wesnoth/src/thread.cpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: thread.cpp,v 1.13 2005/09/04 14:46:36 Sirp Exp $ */
+/* $Id: thread.cpp,v 1.14 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003-5 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -133,7 +133,7 @@
if(SDL_CondSignal(cond_) < 0) {
ERR_G << "SDL_CondSignal: " << SDL_GetError() << "\n";
return false;
- }
+ }
return true;
}
@@ -148,7 +148,7 @@
}
bool async_operation::notify_finished()
-{
+{
finishedVar_ = true;
return finished_.notify_one();
}
Index: wesnoth/src/thread.hpp
diff -u wesnoth/src/thread.hpp:1.8 wesnoth/src/thread.hpp:1.9
--- wesnoth/src/thread.hpp:1.8 Sun Sep 4 14:46:37 2005
+++ wesnoth/src/thread.hpp Tue Sep 6 13:53:14 2005
@@ -1,4 +1,4 @@
-/* $Id: thread.hpp,v 1.8 2005/09/04 14:46:37 Sirp Exp $ */
+/* $Id: thread.hpp,v 1.9 2005/09/06 13:53:14 ott Exp $ */
/*
Copyright (C) 2003-5 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -221,7 +221,7 @@
private:
bool aborted_;
- condition finished_;
+ condition finished_;
bool finishedVar_;
mutex mutex_;
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src actions.cpp ai_attack.cpp cursor.cp...,
ott <=