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

Map Editor compiles with VC++ again

Browse source 
fixes broken enemy unit movement highlighting
minor cleanups
This commit is contained in:
Jörg Hinrichs 2006-04-08 16:33:50 +00:00
parent d361f64ed1
commit 00ac387315
7 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Map Editor.dsp
View file

@ -249,6 +249,10 @@ SOURCE=.\src\language.cpp
# End Source File
# Begin Source File
SOURCE=.\src\loadscreen.cpp
# End Source File
# Begin Source File
SOURCE=.\src\log.cpp
# End Source File
# Begin Source File
@ -293,6 +297,10 @@ SOURCE=.\src\mouse.cpp
# End Source File
# Begin Source File
SOURCE=.\src\mouse_events.cpp
# End Source File
# Begin Source File
SOURCE=.\src\network.cpp
# End Source File
# Begin Source File
@ -425,6 +433,14 @@ SOURCE=.\src\unit.cpp
# End Source File
# Begin Source File
SOURCE=.\src\unit_abilities.cpp
# End Source File
# Begin Source File
SOURCE=.\src\unit_animation.cpp
# End Source File
# Begin Source File
SOURCE=.\src\unit_display.cpp
# End Source File
# Begin Source File

2
src/actions.cpp
View file

@ -1046,7 +1046,7 @@ void attack(display& gui, const gamemap& map,
game_events::fire("attacker_hits",attacker,defender,dat);
a = units.find(attacker);
d = units.find(defender);
if(a == units.end() || d == units.end() || (attack_with != -1 && size_t(attack_with) >= a->second.attacks().size()) || (stats.defend_with != -1 && size_t(stats.defend_with)) >= d->second.attacks().size()) {
if(a == units.end() || d == units.end() || (attack_with != -1 && size_t(attack_with) >= a->second.attacks().size()) || (stats.defend_with != -1 && size_t(stats.defend_with) >= d->second.attacks().size())) {
if (update_display){
recalculate_fog(map,state,info,units,teams,attacker_side-1);
recalculate_fog(map,state,info,units,teams,defender_side-1);

2
src/editor/editor_main.cpp
View file

@ -306,7 +306,7 @@ int main(int argc, char** argv)
catch (gamemap::incorrect_format_exception) {
std::cerr << "The map is not in a correct format, sorry." << std::endl;
return 1;
} catch (CVideo::quit& e) {
} catch (CVideo::quit&) {
return 0;
}
}

8
src/mouse_events.cpp
View file

@ -257,13 +257,11 @@ void mouse_handler::mouse_motion(int x, int y, const bool browse)
}
}
unit_map::const_iterator un = find_unit(new_hex);
unit_map::iterator un = find_unit(new_hex);
if(un != units_.end() && un->second.side() != team_num_ &&
current_paths_.routes.empty() && !(*gui_).fogged(un->first.x,un->first.y)) {
//Quick-Hack because of problems with passing a constant Reference
unit un2 = un->second;
unit_movement_resetter move_reset(un2);
current_paths_.routes.empty() && !(*gui_).fogged(un->first.x,un->first.y)) {
unit_movement_resetter move_reset(un->second);
const bool ignore_zocs = un->second.get_ability_bool("skirmisher",un->first);
const bool teleport = un->second.get_ability_bool("teleport",un->first);

6
src/playturn.hpp
View file

@ -28,12 +28,6 @@ class replay_network_sender;
#include <map>
#include <vector>
struct command_disabler
{
command_disabler();
~command_disabler();
};
class turn_info
{
public:

4
wesnoth.dsp
View file

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MD /W3 /Gm /GR /GX /ZI /Od /I "f:/wesnoth/src" /I "f:/SDL-1.2.7/include" /I "f:/SDL_image-1.2.3/include" /I "f:/SDL_mixer-1.2.5/include" /I "f:/SDL_net-1.2.5/include" /I "src/sdl_ttf" /I "f:/libintl-devel/include" /I "f:/intl/include" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /FR /YX /FD /GZ /c
# ADD CPP /nologo /MD /W3 /Gm /GR /GX /Zi /Od /I "f:/wesnoth/src" /I "f:/SDL-1.2.7/include" /I "f:/SDL_image-1.2.3/include" /I "f:/SDL_mixer-1.2.5/include" /I "f:/SDL_net-1.2.5/include" /I "src/sdl_ttf" /I "f:/libintl-devel/include" /I "f:/intl/include" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@ -70,7 +70,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "f:/wesnoth/src" /I "f:/SDL-1.2.7/include" /I "f:/SDL_image-1.2.3/include" /I "f:/SDL_mixer-1.2.5/include" /I "f:/SDL_net-1.2.5/include" /I "src/sdl_ttf" /I "f:/libintl-devel/include" /I "f:/intl/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /D "HAVE_PYTHON" /FR /YX /FD /GZ /c
# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "f:/wesnoth/src" /I "f:/SDL-1.2.7/include" /I "f:/SDL_image-1.2.3/include" /I "f:/SDL_mixer-1.2.5/include" /I "f:/SDL_net-1.2.5/include" /I "src/sdl_ttf" /I "f:/libintl-devel/include" /I "f:/intl/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /D "HAVE_PYTHON" /FR /YX /FD /GZ /c
# ADD CPP /nologo /MD /W3 /Gm /GR /GX /ZI /Od /I "f:/wesnoth/src" /I "f:/SDL-1.2.7/include" /I "f:/SDL_image-1.2.3/include" /I "f:/SDL_mixer-1.2.5/include" /I "f:/SDL_net-1.2.5/include" /I "src/sdl_ttf" /I "f:/libintl-devel/include" /I "f:/intl/include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /D "HAVE_PYTHON" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"

12
wesnoth.dsw
View file

@ -27,6 +27,18 @@ Package=<4>
###############################################################################
Project: "wesnothd"=.\wesnothd\wesnothd.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>