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

added assertion that the route is empty...

Browse source 
...back into move_unit() and fixed the caller in playturn
This commit is contained in:
Dave White 2004-12-30 13:57:23 +00:00
parent 5b3e540232
commit ce6c79dff2
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/actions.cpp
View file

@ -1570,9 +1570,7 @@ size_t move_unit(display* disp, const game_data& gamedata,
replay* move_recorder, undo_list* undo_stack,
gamemap::location *next_unit, bool continue_move, bool should_clear_shroud)
{
if(route.empty()) {
return 0;
}
assert(route.empty() == false);
//stop the user from issuing any commands while the unit is moving
const command_disabler disable_commands;

11
src/playturn.cpp
View file

@ -264,6 +264,11 @@ void turn_info::handle_event(const SDL_Event& event)
}
void turn_info::mouse_motion(const SDL_MouseMotionEvent& event)
{
mouse_motion(event.x,event.y);
}
void turn_info::mouse_motion(int x, int y)
{
if(minimap_scrolling_) {
//if the game is run in a window, we could miss a LMB/MMB up event
@ -271,7 +276,7 @@ void turn_info::mouse_motion(const SDL_MouseMotionEvent& event)
// thus, we need to check if the LMB/MMB is still down
minimap_scrolling_ = ((SDL_GetMouseState(NULL,NULL) & (SDL_BUTTON(1) | SDL_BUTTON(2))) != 0);
if(minimap_scrolling_) {
const gamemap::location& loc = gui_.minimap_location_on(event.x,event.y);
const gamemap::location& loc = gui_.minimap_location_on(x,y);
if(loc.valid()) {
if(loc != last_hex_) {
last_hex_ = loc;
@ -287,7 +292,7 @@ void turn_info::mouse_motion(const SDL_MouseMotionEvent& event)
gamemap::location::DIRECTION nearest_hex;
const team& current_team = teams_[team_num_-1];
const gamemap::location new_hex = gui_.hex_clicked_on(event.x,event.y,&nearest_hex);
const gamemap::location new_hex = gui_.hex_clicked_on(x,y,&nearest_hex);
if(new_hex != last_hex_ || nearest_hex != last_nearest_) {
if(new_hex.valid() == false) {
@ -446,6 +451,8 @@ private:
void turn_info::mouse_press(const SDL_MouseButtonEvent& event)
{
mouse_motion(event.x,event.y);
if(is_left_click(event) && event.state == SDL_RELEASED) {
minimap_scrolling_ = false;
} else if(is_middle_click(event) && event.state == SDL_RELEASED) {

1
src/playturn.hpp
View file

@ -179,6 +179,7 @@ private:
void handle_event(const SDL_Event& event);
void mouse_motion(const SDL_MouseMotionEvent& event);
void mouse_motion(int x, int y);
void mouse_press(const SDL_MouseButtonEvent& event);
void left_click(const SDL_MouseButtonEvent& event);