[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src ai.cpp cavegen.cpp display.cpp disp...
|
From: |
Isaac Clerencia |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/src ai.cpp cavegen.cpp display.cpp disp... |
|
Date: |
Sun, 06 Feb 2005 05:40:13 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Isaac Clerencia <address@hidden> 05/02/06 10:40:13
Modified files:
src : ai.cpp cavegen.cpp display.cpp display.hpp
game.cpp hotkeys.hpp mapgen.cpp
multiplayer_connect.hpp network_worker.cpp
playlevel.cpp playturn.cpp playturn.hpp
preferences.cpp preferences.hpp unit.hpp
unit_display.cpp unit_types.cpp unit_types.hpp
video.cpp
src/server : game.cpp
src/widgets : scrollarea.cpp scrollarea.hpp scrollbar.cpp
scrollbar.hpp
Log message:
Fix CRLF in source files
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/ai.cpp.diff?tr1=1.136&tr2=1.137&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/cavegen.cpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.286&tr2=1.287&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.hpp.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.187&tr2=1.188&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.hpp.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.cpp.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_connect.hpp.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/network_worker.cpp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playlevel.cpp.diff?tr1=1.175&tr2=1.176&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.327&tr2=1.328&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.hpp.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.cpp.diff?tr1=1.130&tr2=1.131&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/preferences.hpp.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit.hpp.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.cpp.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.hpp.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/video.cpp.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/game.cpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollarea.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollarea.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollbar.cpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollbar.hpp.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: wesnoth/src/ai.cpp
diff -u wesnoth/src/ai.cpp:1.136 wesnoth/src/ai.cpp:1.137
--- wesnoth/src/ai.cpp:1.136 Sat Jan 29 18:11:26 2005
+++ wesnoth/src/ai.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: ai.cpp,v 1.136 2005/01/29 18:11:26 Sirp Exp $ */
+/* $Id: ai.cpp,v 1.137 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -258,11 +258,11 @@
}
const int num = std::distance(recruits.begin(),i);
-
- //we have to add the recruit command now, because when the unit is
created it has
- //to have the recruit command in the recorder to be able to put random
numbers into
- //to generate unit traits. However we're not sure the transaction is
going through yet,
- //so use a replay_undo object to cancel it if we don't get to the point
where the transaction
+
+ //we have to add the recruit command now, because when the unit is
created it has
+ //to have the recruit command in the recorder to be able to put random
numbers into
+ //to generate unit traits. However we're not sure the transaction is
going through yet,
+ //so use a replay_undo object to cancel it if we don't get to the point
where the transaction
//is confirmed
recorder.add_recruit(num,loc);
replay_undo replay_guard(recorder);
@@ -385,8 +385,8 @@
paths_wiper wiper(info_.disp);
const std::map<location,paths>::iterator p_it =
possible_moves.find(from);
-
- unit current_unit = u_it->second;
+
+ unit current_unit = u_it->second;
if(p_it != possible_moves.end()) {
paths& p = p_it->second;
@@ -434,16 +434,16 @@
info_.disp.set_paths(¤t_paths);
}
-
info_.disp.scroll_to_tiles(from.x,from.y,to.x,to.y);
- info_.units.erase(u_it);
- u_it = info_.units.end();
+
info_.disp.scroll_to_tiles(from.x,from.y,to.x,to.y);
+ info_.units.erase(u_it);
+ u_it = info_.units.end();
unit_display::move_unit(info_.disp,info_.map,steps,current_unit,info_.state.get_time_of_day(),info_.units,info_.teams);
}
}
- }
-
- if(u_it != info_.units.end()) {
- info_.units.erase(u_it);
+ }
+
+ if(u_it != info_.units.end()) {
+ info_.units.erase(u_it);
}
current_unit.set_movement(0);
Index: wesnoth/src/cavegen.cpp
diff -u wesnoth/src/cavegen.cpp:1.13 wesnoth/src/cavegen.cpp:1.14
--- wesnoth/src/cavegen.cpp:1.13 Thu Jan 27 22:38:05 2005
+++ wesnoth/src/cavegen.cpp Sun Feb 6 10:40:12 2005
@@ -307,10 +307,10 @@
passage_path_calculator calc(map_,wall_,laziness,windiness);
- const paths::route rt = a_star_search(p.src, p.dst, 10000.0, &calc,
width_, height_);
+ const paths::route rt = a_star_search(p.src, p.dst, 10000.0, &calc,
width_, height_);
+
+ const size_t width = maximum<size_t>(1,atoi(p.cfg["width"].c_str()));
- const size_t width = maximum<size_t>(1,atoi(p.cfg["width"].c_str()));
-
const size_t jagged = atoi(p.cfg["jagged"].c_str());
for(std::vector<gamemap::location>::const_iterator i =
rt.steps.begin(); i != rt.steps.end(); ++i) {
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.286 wesnoth/src/display.cpp:1.287
--- wesnoth/src/display.cpp:1.286 Fri Jan 28 20:22:03 2005
+++ wesnoth/src/display.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.286 2005/01/28 20:22:03 silene Exp $ */
+/* $Id: display.cpp,v 1.287 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -670,12 +670,12 @@
//TODO: review whether this is the correct thing to do
SDL_Delay(maximum<int>(10,wait_time));
- if(update) {
- lastDraw_ = SDL_GetTicks();
+ if(update) {
+ lastDraw_ = SDL_GetTicks();
if(wait_time >= 0 || drawSkips_ >= max_skips || force) {
- if(changed) {
- update_display();
+ if(changed) {
+ update_display();
}
} else {
drawSkips_++;
@@ -687,31 +687,31 @@
{
if(updatesLocked_ > 0)
return;
-
- if(preferences::show_fps()) {
- static int last_sample = SDL_GetTicks();
- static int frames = 0;
- ++frames;
-
- if(frames == 10) {
- const int this_sample = SDL_GetTicks();
-
- const int fps = (frames*1000)/(this_sample -
last_sample);
- last_sample = this_sample;
- frames = 0;
-
- if(fps_handle_ != 0) {
- font::remove_floating_label(fps_handle_);
- fps_handle_ = 0;
- }
- std::ostringstream stream;
- stream << fps << "fps";
- fps_handle_ =
font::add_floating_label(stream.str(),12,font::NORMAL_COLOUR,10,100,0,0,-1,screen_area(),font::LEFT_ALIGN);
- }
- } else if(fps_handle_ != 0) {
- font::remove_floating_label(fps_handle_);
- fps_handle_ = 0;
- }
+
+ if(preferences::show_fps()) {
+ static int last_sample = SDL_GetTicks();
+ static int frames = 0;
+ ++frames;
+
+ if(frames == 10) {
+ const int this_sample = SDL_GetTicks();
+
+ const int fps = (frames*1000)/(this_sample -
last_sample);
+ last_sample = this_sample;
+ frames = 0;
+
+ if(fps_handle_ != 0) {
+ font::remove_floating_label(fps_handle_);
+ fps_handle_ = 0;
+ }
+ std::ostringstream stream;
+ stream << fps << "fps";
+ fps_handle_ =
font::add_floating_label(stream.str(),12,font::NORMAL_COLOUR,10,100,0,0,-1,screen_area(),font::LEFT_ALIGN);
+ }
+ } else if(fps_handle_ != 0) {
+ font::remove_floating_label(fps_handle_);
+ fps_handle_ = 0;
+ }
screen_.flip();
}
Index: wesnoth/src/display.hpp
diff -u wesnoth/src/display.hpp:1.91 wesnoth/src/display.hpp:1.92
--- wesnoth/src/display.hpp:1.91 Thu Jan 27 03:45:00 2005
+++ wesnoth/src/display.hpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: display.hpp,v 1.91 2005/01/27 03:45:00 Sirp Exp $ */
+/* $Id: display.hpp,v 1.92 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -507,9 +507,9 @@
int help_string_;
//animated flags for each team
- std::vector<animated<image::locator> > flags_;
-
- //the handle for the label which displays fps
+ std::vector<animated<image::locator> > flags_;
+
+ //the handle for the label which displays fps
int fps_handle_;
};
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.187 wesnoth/src/game.cpp:1.188
--- wesnoth/src/game.cpp:1.187 Sat Feb 5 04:09:07 2005
+++ wesnoth/src/game.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.187 2005/02/05 04:09:07 Sirp Exp $ */
+/* $Id: game.cpp,v 1.188 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -383,9 +383,9 @@
if(val.empty()) {
continue;
}
-
- if(val == "--fps") {
- preferences::set_show_fps(true);
+
+ if(val == "--fps") {
+ preferences::set_show_fps(true);
} else if(val == "--nocache") {
use_caching_ = false;
} else if(val == "--resolution" || val == "-r") {
@@ -446,11 +446,11 @@
display& game_controller::disp()
{
- if(disp_.get() == NULL) {
-
- if(get_video_surface() == NULL) {
- throw CVideo::error();
- }
+ if(disp_.get() == NULL) {
+
+ if(get_video_surface() == NULL) {
+ throw CVideo::error();
+ }
static display::unit_map dummy_umap;
static config dummy_cfg("");
@@ -741,10 +741,10 @@
}
if ((*side)["random_faction"] == "yes") {
- const config::child_list& eras =
era_cfg->get_children("multiplayer_side");
- for(int i = 0; i != 100 && (*side)["random_faction"] ==
"yes"; ++i) {
- side = eras[rand()%eras.size()];
- }
+ const config::child_list& eras =
era_cfg->get_children("multiplayer_side");
+ for(int i = 0; i != 100 && (*side)["random_faction"] ==
"yes"; ++i) {
+ side = eras[rand()%eras.size()];
+ }
if ((*side)["random_faction"] == "yes")
goto unknown_side_id;
}
@@ -1010,42 +1010,42 @@
state_.campaign_define = campaign["define"];
return true;
-}
-
-namespace
-{
-
-std::string format_file_size(const std::string& size_str)
-{
- double size = lexical_cast_default<double>(size_str,0.0);
-
- const double k = 1024;
- if(size > 0.0) {
- std::string size_postfix = _("B");
- if(size > k) {
- size /= k;
- size_postfix = _("KB");
- if(size > k) {
- size /= k;
- size_postfix = _("MB");
- }
- }
-
- std::ostringstream stream;
- //Visual C++ makes 'precision' set the number of decimal
places. Other platforms
- //make it set the number of significant figures
-#ifdef _MSC_VER
- stream.precision(1);
-#else
- stream.precision(3);
-#endif
- stream << std::fixed << size << size_postfix;
- return stream.str();
- } else {
- return "";
- }
-}
-
+}
+
+namespace
+{
+
+std::string format_file_size(const std::string& size_str)
+{
+ double size = lexical_cast_default<double>(size_str,0.0);
+
+ const double k = 1024;
+ if(size > 0.0) {
+ std::string size_postfix = _("B");
+ if(size > k) {
+ size /= k;
+ size_postfix = _("KB");
+ if(size > k) {
+ size /= k;
+ size_postfix = _("MB");
+ }
+ }
+
+ std::ostringstream stream;
+ //Visual C++ makes 'precision' set the number of decimal
places. Other platforms
+ //make it set the number of significant figures
+#ifdef _MSC_VER
+ stream.precision(1);
+#else
+ stream.precision(3);
+#endif
+ stream << std::fixed << size << size_postfix;
+ return stream.str();
+ } else {
+ return "";
+ }
+}
+
}
void game_controller::download_campaigns()
@@ -1102,18 +1102,18 @@
std::vector<std::string> delete_options;
- for(config::child_list::const_iterator i = cmps.begin(); i !=
cmps.end(); ++i) {
+ for(config::child_list::const_iterator i = cmps.begin(); i !=
cmps.end(); ++i) {
const std::string& name = (**i)["name"];
campaigns.push_back(name);
if(std::count(publish_options.begin(),publish_options.end(),name) != 0) {
delete_options.push_back(name);
}
-
- std::string title = (**i)["title"];
- if(title == "") {
- title = name;
- std::replace(title.begin(),title.end(),'_',' ');
+
+ std::string title = (**i)["title"];
+ if(title == "") {
+ title = name;
+ std::replace(title.begin(),title.end(),'_',' ');
}
options.push_back(IMAGE_PREFIX + (**i)["icon"] +
COLUMN_SEPARATOR +
@@ -1394,7 +1394,7 @@
old_defines_map_ = defines_map_;
}
- } catch(config::error& e) {
+ } catch(config::error& e) {
std::cerr << "Error loading game configuration files\n";
gui::show_error_message(disp(), _("Error loading game
configuration files: '") +
e.message + _("' (The game will now
exit)"));
Index: wesnoth/src/hotkeys.hpp
diff -u wesnoth/src/hotkeys.hpp:1.54 wesnoth/src/hotkeys.hpp:1.55
--- wesnoth/src/hotkeys.hpp:1.54 Sat Jan 22 00:25:54 2005
+++ wesnoth/src/hotkeys.hpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.hpp,v 1.54 2005/01/22 00:25:54 Sirp Exp $ */
+/* $Id: hotkeys.hpp,v 1.55 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -118,8 +118,8 @@
//abstract base class for objects that implement the ability
//to execute hotkey commands.
class command_executor
-{
-protected:
+{
+protected:
virtual ~command_executor() {}
public:
Index: wesnoth/src/mapgen.cpp
diff -u wesnoth/src/mapgen.cpp:1.54 wesnoth/src/mapgen.cpp:1.55
--- wesnoth/src/mapgen.cpp:1.54 Sun Jan 23 14:25:25 2005
+++ wesnoth/src/mapgen.cpp Sun Feb 6 10:40:12 2005
@@ -19,9 +19,9 @@
#include "pathfind.hpp"
#include "race.hpp"
#include "scoped_resource.hpp"
-#include "util.hpp"
-
-#define ERR_CF lg::err(lg::config)
+#include "util.hpp"
+
+#define ERR_CF lg::err(lg::config)
#define LOG_NG lg::info(lg::engine)
//function to generate a random map, from a string which describes
Index: wesnoth/src/multiplayer_connect.hpp
diff -u wesnoth/src/multiplayer_connect.hpp:1.23
wesnoth/src/multiplayer_connect.hpp:1.24
--- wesnoth/src/multiplayer_connect.hpp:1.23 Tue Jan 18 12:25:21 2005
+++ wesnoth/src/multiplayer_connect.hpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_connect.hpp,v 1.23 2005/01/18 12:25:21 isaaccp Exp $ */
+/* $Id: multiplayer_connect.hpp,v 1.24 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -59,8 +59,8 @@
void remove_player(const std::string& name);
void update_positions();
void update_network();
- bool is_full();
-
+ bool is_full();
+
size_t combo_index_to_team(size_t index) const;
display *disp_;
Index: wesnoth/src/network_worker.cpp
diff -u wesnoth/src/network_worker.cpp:1.15 wesnoth/src/network_worker.cpp:1.16
--- wesnoth/src/network_worker.cpp:1.15 Sun Jan 23 22:04:20 2005
+++ wesnoth/src/network_worker.cpp Sun Feb 6 10:40:12 2005
@@ -167,24 +167,24 @@
}
cond->notify_one();
-}
-
-namespace
-{
-
-void remove_buffers(TCPsocket sock)
-{
- buffer_set new_bufs;
- new_bufs.reserve(bufs.size());
- for(buffer_set::iterator i = bufs.begin(), i_end = bufs.end(); i !=
i_end; ++i) {
- if ((*i)->sock == sock)
- delete *i;
- else
- new_bufs.push_back(*i);
- }
- bufs.swap(new_bufs);
-}
-
+}
+
+namespace
+{
+
+void remove_buffers(TCPsocket sock)
+{
+ buffer_set new_bufs;
+ new_bufs.reserve(bufs.size());
+ for(buffer_set::iterator i = bufs.begin(), i_end = bufs.end(); i !=
i_end; ++i) {
+ if ((*i)->sock == sock)
+ delete *i;
+ else
+ new_bufs.push_back(*i);
+ }
+ bufs.swap(new_bufs);
+}
+
}
void close_socket(TCPsocket sock)
@@ -202,7 +202,7 @@
if(lock_it != sockets_locked.end()) {
sockets_locked.erase(lock_it);
}
-
+
remove_buffers(sock);
break;
@@ -218,7 +218,7 @@
if(i->second == SOCKET_ERROR) {
--socket_errors;
const TCPsocket res = i->first;
- sockets_locked.erase(i);
+ sockets_locked.erase(i);
remove_buffers(res);
return res;
}
Index: wesnoth/src/playlevel.cpp
diff -u wesnoth/src/playlevel.cpp:1.175 wesnoth/src/playlevel.cpp:1.176
--- wesnoth/src/playlevel.cpp:1.175 Thu Feb 3 20:54:55 2005
+++ wesnoth/src/playlevel.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: playlevel.cpp,v 1.175 2005/02/03 20:54:55 silene Exp $ */
+/* $Id: playlevel.cpp,v 1.176 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -118,9 +118,9 @@
config* level, CVideo& video,
game_state& state_of_game,
const std::vector<config*>& story)
-{
- //guarantee the cursor goes back to 'normal' at the end of the level
- const cursor::setter cursor_setter(cursor::NORMAL);
+{
+ //guarantee the cursor goes back to 'normal' at the end of the level
+ const cursor::setter cursor_setter(cursor::NORMAL);
const int ticks = SDL_GetTicks();
LOG_NG << "in play_level()...\n";
@@ -745,12 +745,12 @@
try {
game_events::fire("victory");
} catch(end_level_exception&) {
- }
-
- if(state_of_game.scenario == (*level)["id"]) {
- state_of_game.scenario =
(*level)["next_scenario"];
- }
-
+ }
+
+ if(state_of_game.scenario == (*level)["id"]) {
+ state_of_game.scenario =
(*level)["next_scenario"];
+ }
+
const bool has_next_scenario =
!state_of_game.scenario.empty() &&
state_of_game.scenario
!= "null";
@@ -781,9 +781,9 @@
std::stringstream report;
- for(std::vector<team>::iterator i=teams.begin();
i!=teams.end(); ++i) {
- if (!i->is_persistent())
- continue;
+ for(std::vector<team>::iterator i=teams.begin();
i!=teams.end(); ++i) {
+ if (!i->is_persistent())
+ continue;
player_info
*player=state_of_game.get_player(i->save_id());
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.327 wesnoth/src/playturn.cpp:1.328
--- wesnoth/src/playturn.cpp:1.327 Sat Jan 29 22:13:52 2005
+++ wesnoth/src/playturn.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.327 2005/01/29 22:13:52 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.328 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -710,10 +710,10 @@
bool turn_info::move_unit_along_current_route(bool check_shroud)
{
- const std::vector<gamemap::location> steps = current_route_.steps;
- if(steps.empty()) {
- return false;
- }
+ const std::vector<gamemap::location> steps = current_route_.steps;
+ if(steps.empty()) {
+ return false;
+ }
const size_t moves =
::move_unit(&gui_,gameinfo_,status_,map_,units_,teams_,
steps,&recorder,&undo_stack_,&next_unit_,false,check_shroud);
@@ -1301,10 +1301,10 @@
if(un != units_.end() && un->second.side() == team_num_ &&
un->second.movement_left() >= 0) {
un->second.set_user_end_turn(!un->second.user_end_turn());
gui_.draw_tile(selected_hex_.x,selected_hex_.y);
-
+
gui_.set_route(NULL);
gui_.set_paths(NULL);
- current_paths_ = paths();
+ current_paths_ = paths();
gui_.draw();
if(un->second.user_end_turn()) {
Index: wesnoth/src/playturn.hpp
diff -u wesnoth/src/playturn.hpp:1.60 wesnoth/src/playturn.hpp:1.61
--- wesnoth/src/playturn.hpp:1.60 Thu Dec 30 13:57:23 2004
+++ wesnoth/src/playturn.hpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.hpp,v 1.60 2004/12/30 13:57:23 Sirp Exp $ */
+/* $Id: playturn.hpp,v 1.61 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -178,7 +178,7 @@
void do_recruit(const std::string& name);
void handle_event(const SDL_Event& event);
- void mouse_motion(const SDL_MouseMotionEvent& event);
+ void mouse_motion(const SDL_MouseMotionEvent& event);
void mouse_motion(int x, int y);
void mouse_press(const SDL_MouseButtonEvent& event);
@@ -227,7 +227,7 @@
paths current_paths_, all_paths_;
paths::route current_route_;
bool enemy_paths_;
- gamemap::location last_hex_;
+ gamemap::location last_hex_;
gamemap::location::DIRECTION last_nearest_;
gamemap::location selected_hex_;
undo_list undo_stack_;
Index: wesnoth/src/preferences.cpp
diff -u wesnoth/src/preferences.cpp:1.130 wesnoth/src/preferences.cpp:1.131
--- wesnoth/src/preferences.cpp:1.130 Thu Jan 27 03:45:00 2005
+++ wesnoth/src/preferences.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.cpp,v 1.130 2005/01/27 03:45:00 Sirp Exp $ */
+/* $Id: preferences.cpp,v 1.131 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -50,8 +50,8 @@
bool haloes = true;
-bool unit_genders = true;
-
+bool unit_genders = true;
+
bool fps = false;
std::set<std::string> encountered_units_set;
@@ -704,16 +704,16 @@
{
haloes = value;
prefs["show_haloes"] = value ? "yes" : "no";
-}
-
-bool show_fps()
-{
- return fps;
-}
-
-void set_show_fps(bool value)
-{
- fps = value;
+}
+
+bool show_fps()
+{
+ return fps;
+}
+
+void set_show_fps(bool value)
+{
+ fps = value;
}
std::set<std::string> &encountered_units() {
Index: wesnoth/src/preferences.hpp
diff -u wesnoth/src/preferences.hpp:1.46 wesnoth/src/preferences.hpp:1.47
--- wesnoth/src/preferences.hpp:1.46 Thu Jan 27 03:45:00 2005
+++ wesnoth/src/preferences.hpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: preferences.hpp,v 1.46 2005/01/27 03:45:00 Sirp Exp $ */
+/* $Id: preferences.hpp,v 1.47 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -144,9 +144,9 @@
void set_show_tip_of_day(bool value);
bool show_haloes();
- void set_show_haloes(bool value);
-
- bool show_fps();
+ void set_show_haloes(bool value);
+
+ bool show_fps();
void set_show_fps(bool value);
std::set<std::string> &encountered_units();
Index: wesnoth/src/server/game.cpp
diff -u wesnoth/src/server/game.cpp:1.25 wesnoth/src/server/game.cpp:1.26
--- wesnoth/src/server/game.cpp:1.25 Sat Feb 5 12:27:14 2005
+++ wesnoth/src/server/game.cpp Sun Feb 6 10:40:13 2005
@@ -253,7 +253,7 @@
sprintf(buf,"%d",val);
if(buf != (*description())["slots"]) {
- description()->values["slots"] = buf;
+ description()->values["slots"] = buf;
description()->values["observer"] = level_["observer"];
return true;
} else {
@@ -334,10 +334,10 @@
void game::add_player(network::connection player)
{
//if the game has already started, we add the player as an observer
- if(started_) {
- if(!allow_observers_) {
- return;
- }
+ if(started_) {
+ if(!allow_observers_) {
+ return;
+ }
const player_map::const_iterator info =
player_info_->find(player);
if(info != player_info_->end()) {
Index: wesnoth/src/unit.hpp
diff -u wesnoth/src/unit.hpp:1.58 wesnoth/src/unit.hpp:1.59
--- wesnoth/src/unit.hpp:1.58 Sat Jan 1 00:44:50 2005
+++ wesnoth/src/unit.hpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: unit.hpp,v 1.58 2005/01/01 00:44:50 Sirp Exp $ */
+/* $Id: unit.hpp,v 1.59 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -87,8 +87,8 @@
bool poisoned() const;
bool stone() const;
- bool incapacitated() const;
-
+ bool incapacitated() const;
+
bool emits_zoc() const;
bool matches_filter(const config& cfg) const;
@@ -116,9 +116,9 @@
//gets the unit image that should currently be displayed
//(could be in the middle of an attack etc)
const std::string& image() const;
-
+
void set_standing();
- void set_defending(bool hits, attack_type::RANGE range, int
start_frame, int acceleration);
+ void set_defending(bool hits, attack_type::RANGE range, int
start_frame, int acceleration);
void update_defending_frame();
void set_attacking(bool newval, const attack_type* type=NULL, int ms=0);
@@ -218,9 +218,9 @@
UPKEEP_COST upkeep_;
- bool unrenamable_;
-
- unit_animation anim_;
+ bool unrenamable_;
+
+ unit_animation anim_;
const unit_animation* get_animation() const;
void reset_modifications();
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.48 wesnoth/src/unit_display.cpp:1.49
--- wesnoth/src/unit_display.cpp:1.48 Thu Feb 3 23:09:31 2005
+++ wesnoth/src/unit_display.cpp Sun Feb 6 10:40:12 2005
@@ -166,7 +166,7 @@
}
const int new_ticks = SDL_GetTicks();
- const int wait_time = time_between_frames - (new_ticks - ticks);
+ const int wait_time = time_between_frames - (new_ticks - ticks);
SDL_Delay(maximum<int>(wait_time,1));
ticks = SDL_GetTicks();
@@ -579,13 +579,13 @@
if(leader_loc.valid()){
leader->second.set_leading(false);
}
-
- disp.invalidate(a);
+
+ disp.invalidate(a);
disp.invalidate(b);
def->second.set_standing();
- if(leader_loc.valid()){
+ if(leader_loc.valid()){
disp.draw_tile(leader_loc.x,leader_loc.y);
}
@@ -842,8 +842,8 @@
if(leader_loc.valid()){
leader->second.set_leading(false);
}
-
- disp.invalidate(a);
+
+ disp.invalidate(a);
disp.invalidate(b);
if(leader_loc.valid()) {
disp.draw_tile(leader_loc.x,leader_loc.y);
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.75 wesnoth/src/unit_types.cpp:1.76
--- wesnoth/src/unit_types.cpp:1.75 Sat Jan 1 00:44:50 2005
+++ wesnoth/src/unit_types.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.75 2005/01/01 00:44:50 Sirp Exp $ */
+/* $Id: unit_types.cpp,v 1.76 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -959,11 +959,11 @@
bool unit_type::can_advance() const
{
return can_advance_;
-}
-
-bool unit_type::has_zoc() const
-{
- return level() > 0;
+}
+
+bool unit_type::has_zoc() const
+{
+ return level() > 0;
}
bool unit_type::has_ability(const std::string& ability) const
Index: wesnoth/src/unit_types.hpp
diff -u wesnoth/src/unit_types.hpp:1.55 wesnoth/src/unit_types.hpp:1.56
--- wesnoth/src/unit_types.hpp:1.55 Sat Jan 1 00:44:50 2005
+++ wesnoth/src/unit_types.hpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.hpp,v 1.55 2005/01/01 00:44:50 Sirp Exp $ */
+/* $Id: unit_types.hpp,v 1.56 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -39,7 +39,7 @@
std::string halo;
int halo_x, halo_y;
};
-
+
unit_animation();
explicit unit_animation(const config& cfg);
@@ -229,8 +229,8 @@
bool nightvision() const;
bool steadfast() const;
bool not_living() const;
- bool can_advance() const;
-
+ bool can_advance() const;
+
bool has_zoc() const;
bool has_ability(const std::string& ability) const;
Index: wesnoth/src/video.cpp
diff -u wesnoth/src/video.cpp:1.54 wesnoth/src/video.cpp:1.55
--- wesnoth/src/video.cpp:1.54 Sun Jan 2 05:40:04 2005
+++ wesnoth/src/video.cpp Sun Feb 6 10:40:12 2005
@@ -1,4 +1,4 @@
-/* $Id: video.cpp,v 1.54 2005/01/02 05:40:04 Sirp Exp $ */
+/* $Id: video.cpp,v 1.55 2005/02/06 10:40:12 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -318,7 +318,7 @@
return;
halo::render();
- font::draw_floating_labels(frameBuffer);
+ font::draw_floating_labels(frameBuffer);
events::raise_volatile_draw_event();
cursor::draw(frameBuffer);
if(update_all) {
@@ -329,7 +329,7 @@
clear_updates();
- cursor::undraw(frameBuffer);
+ cursor::undraw(frameBuffer);
events::raise_volatile_undraw_event();
font::undraw_floating_labels(frameBuffer);
halo::unrender();
Index: wesnoth/src/widgets/scrollarea.cpp
diff -u wesnoth/src/widgets/scrollarea.cpp:1.7
wesnoth/src/widgets/scrollarea.cpp:1.8
--- wesnoth/src/widgets/scrollarea.cpp:1.7 Sun Jan 23 00:28:34 2005
+++ wesnoth/src/widgets/scrollarea.cpp Sun Feb 6 10:40:13 2005
@@ -1,4 +1,4 @@
-/* $Id: scrollarea.cpp,v 1.7 2005/01/23 00:28:34 Sirp Exp $*/
+/* $Id: scrollarea.cpp,v 1.8 2005/02/06 10:40:13 isaaccp Exp $*/
/*
Copyright (C) 2004 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -74,11 +74,11 @@
unsigned scrollarea::get_position() const
{
return scrollbar_.get_position();
-}
-
-unsigned scrollarea::get_max_position() const
-{
- return scrollbar_.get_max_position();
+}
+
+unsigned scrollarea::get_max_position() const
+{
+ return scrollbar_.get_max_position();
}
void scrollarea::set_position(unsigned pos)
Index: wesnoth/src/widgets/scrollarea.hpp
diff -u wesnoth/src/widgets/scrollarea.hpp:1.4
wesnoth/src/widgets/scrollarea.hpp:1.5
--- wesnoth/src/widgets/scrollarea.hpp:1.4 Sun Jan 23 00:28:34 2005
+++ wesnoth/src/widgets/scrollarea.hpp Sun Feb 6 10:40:13 2005
@@ -1,4 +1,4 @@
-/* $Id: scrollarea.hpp,v 1.4 2005/01/23 00:28:34 Sirp Exp $ */
+/* $Id: scrollarea.hpp,v 1.5 2005/02/06 10:40:13 isaaccp Exp $ */
/*
Copyright (C) 2004 by Guillaume Melquiond <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -41,7 +41,7 @@
SDL_Rect inner_location() const;
unsigned scrollbar_width() const;
- unsigned get_position() const;
+ unsigned get_position() const;
unsigned get_max_position() const;
void set_position(unsigned pos);
void adjust_position(unsigned pos);
Index: wesnoth/src/widgets/scrollbar.cpp
diff -u wesnoth/src/widgets/scrollbar.cpp:1.25
wesnoth/src/widgets/scrollbar.cpp:1.26
--- wesnoth/src/widgets/scrollbar.cpp:1.25 Sun Jan 23 00:28:34 2005
+++ wesnoth/src/widgets/scrollbar.cpp Sun Feb 6 10:40:13 2005
@@ -1,4 +1,4 @@
-/* $Id: scrollbar.cpp,v 1.25 2005/01/23 00:28:34 Sirp Exp $*/
+/* $Id: scrollbar.cpp,v 1.26 2005/02/06 10:40:13 isaaccp Exp $*/
/*
Copyright (C) 2003 by David White <address@hidden>
2004 by Guillaume Melquiond <address@hidden>
@@ -76,11 +76,11 @@
unsigned scrollbar::get_position() const
{
return grip_position_;
-}
-
-unsigned scrollbar::get_max_position() const
-{
- return full_height_ - grip_height_;
+}
+
+unsigned scrollbar::get_max_position() const
+{
+ return full_height_ - grip_height_;
}
void scrollbar::set_position(unsigned pos)
Index: wesnoth/src/widgets/scrollbar.hpp
diff -u wesnoth/src/widgets/scrollbar.hpp:1.13
wesnoth/src/widgets/scrollbar.hpp:1.14
--- wesnoth/src/widgets/scrollbar.hpp:1.13 Sun Jan 23 00:28:34 2005
+++ wesnoth/src/widgets/scrollbar.hpp Sun Feb 6 10:40:13 2005
@@ -1,4 +1,4 @@
-/* $Id: scrollbar.hpp,v 1.13 2005/01/23 00:28:34 Sirp Exp $ */
+/* $Id: scrollbar.hpp,v 1.14 2005/02/06 10:40:13 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
2004 by Guillaume Melquiond <address@hidden>
@@ -38,8 +38,8 @@
/// This function is used to determine where the scrollbar is.
/// \return the position. For example, will return 0 if the scrollbar
/// is at the top, and (full_size - shown_size) if it is at the bottom.
- unsigned get_position() const;
-
+ unsigned get_position() const;
+
unsigned get_max_position() const;
/// Used to manually update the scrollbar.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src ai.cpp cavegen.cpp display.cpp disp...,
Isaac Clerencia <=