[[vc++ and inclusion handling fixes]]

- changed include paths to be relative to source root
- removed some unnecessary includes
- added some includes of global.hpp to editor files to prevent useless vc++ compiler warnings
- Extended vc++ project files
- fixed the bug of having to press escape two times in a continuous replay to get back to the titlescreen

Map Editor.dsp

@@ -0,0 +1,491 @@
+# Microsoft Developer Studio Project File - Name="Map Editor" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** NICHT BEARBEITEN **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=Map Editor - Win32 Release
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE 
+!MESSAGE NMAKE /f "Map Editor.mak".
+!MESSAGE 
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
+!MESSAGE 
+!MESSAGE NMAKE /f "Map Editor.mak" CFG="Map Editor - Win32 Release"
+!MESSAGE 
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE 
+!MESSAGE "Map Editor - Win32 Release" (basierend auf  "Win32 (x86) Application")
+!MESSAGE "Map Editor - Win32 Debug" (basierend auf  "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Map Editor - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib /nologo /subsystem:windows /machine:I386 /out:"Release/editor.exe"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "Map Editor - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_FRIBIDI" /FR /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib /nologo /subsystem:windows /machine:I386 /out:"Release/editor.exe"
+# SUBTRACT BASE LINK32 /nodefaultlib
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib /nologo /subsystem:windows /machine:I386 /out:"Release/editor.exe"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Map Editor - Win32 Release"
+# Name "Map Editor - Win32 Debug"
+# Begin Group "Quellcodedateien"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\src\about.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\actions.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\animated.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\astarnode.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\serialization\binary_or_text.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\serialization\binary_wml.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\builder.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\button.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\cavegen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\checksum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\clipboard.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\color_range.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\config.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\cursor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\dialogs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\display.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_dialogs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_layout.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_palettes.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_undo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\events.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\file_chooser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\filechooser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\filesystem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\font.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\game_config.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\game_events.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\gamestatus.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\gettext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\halo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\help.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\hotkeys.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\image.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\key.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\label.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\language.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\log.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\map.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\map_create.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\map_label.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\map_manip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\mapgen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\mapgen_dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=".\src\marked-up_text.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\menu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\minimap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\mouse.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\network.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\network_worker.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\serialization\parser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\pathfind.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\pathutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\playturn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\preferences.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\preferences_display.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\serialization\preprocessor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\progressbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\race.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\random.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\replay.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\reports.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\scenario_editor.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\scrollarea.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\scrollbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\sdl_ttf\SDL_ttf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\sdl_utils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\show_dialog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\slider.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\sound.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\statistics.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\serialization\string_utils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\team.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\terrain.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\textbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\theme.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\thread.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\serialization\tokenizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\tooltips.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\tstring.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\unit.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\unit_display.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\unit_types.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\util.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\variable.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\video.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\widgets\widget.cpp
+# End Source File
+# End Group
+# Begin Group "Header-Dateien"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\src\editor\editor.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_dialogs.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_layout.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_palettes.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\editor_undo.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\map_manip.hpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\editor\scenario_editor.hpp
+# End Source File
+# End Group
+# Begin Group "Ressourcendateien"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\src\editor.rc
+# End Source File
+# End Group
+# End Target
+# End Project

src/about.cpp

@@ -11,20 +11,13 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
-#include "events.hpp"
+#include "about.hpp"
+#include "display.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
 #include "gettext.hpp"
-#include "image.hpp"
-#include "key.hpp"
 #include "marked-up_text.hpp"
-#include "display.hpp"
-#include "sdl_utils.hpp"
 #include "video.hpp"
-#include "widgets/button.hpp"
-
-#include <sstream>
 
 namespace about
 {

src/about.hpp

@@ -14,6 +14,8 @@
 #ifndef ABOUT_H_INCLUDED
 #define ABOUT_H_INCLUDED
 
+#include "global.hpp"
+
 class display;
 
 #include <vector>

src/actions.cpp

@@ -11,42 +11,24 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
-
 #include "actions.hpp"
 #include "checksum.hpp"
-#include "display.hpp"
-#include "events.hpp"
 #include "game_config.hpp"
 #include "game_errors.hpp"
 #include "game_events.hpp"
 #include "gettext.hpp"
-#include "halo.hpp"
-#include "hotkeys.hpp"
-#include "key.hpp"
-#include "log.hpp"
-#include "map.hpp"
 #include "pathfind.hpp"
 #include "playlevel.hpp"
 #include "playturn.hpp"
 #include "preferences.hpp"
+#include "random.hpp"
 #include "replay.hpp"
 #include "sound.hpp"
-#include "statistics.hpp"
 #include "unit_display.hpp"
-#include "util.hpp"
-#include "video.hpp"
 #include "wassert.hpp"
 #include "wml_separators.hpp"
-#include "serialization/string_utils.hpp"
 #include "serialization/binary_wml.hpp"
 #include "serialization/parser.hpp"
-#include "widgets/menu.hpp"
-
-#include <cmath>
-#include <set>
-#include <string>
-#include <sstream>
 
 #define LOG_NG LOG_STREAM(info, engine)
 #define ERR_NW LOG_STREAM(err, network)

src/actions.hpp

@@ -18,14 +18,12 @@ class display;
 class gamestatus;
 class replay;
 
+#include "global.hpp"
+
 #include "map.hpp"
 #include "unit.hpp"
-#include "unit_types.hpp"
 
 #include <deque>
-#include <map>
-#include <string>
-#include <vector>
 
 //this file defines various functions which implement different in-game
 //events and commands.

src/ai.cpp

@@ -11,34 +11,22 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
-
-#include "actions.hpp"
 #include "ai.hpp"
 #include "ai2.hpp"
 #include "ai_dfool.hpp"
 #ifdef HAVE_PYTHON
 #include "ai_python.hpp"
 #endif
-//#include "advanced_ai.hpp"
 #include "dialogs.hpp"
 #include "game_config.hpp"
 #include "game_events.hpp"
-#include "log.hpp"
-#include "network.hpp"
-#include "pathfind.hpp"
-#include "playlevel.hpp"
 #include "playturn.hpp"
 #include "preferences.hpp"
 #include "replay.hpp"
 #include "statistics.hpp"
-#include "unit.hpp"
 #include "unit_display.hpp"
-#include "util.hpp"
 #include "wassert.hpp"
 
-#include <iostream>
-
 #define LOG_AI LOG_STREAM(info, ai)
 #define WRN_AI LOG_STREAM(warn, ai)
 #define ERR_AI LOG_STREAM(err, ai)

src/ai.hpp

@@ -13,6 +13,8 @@
 #ifndef AI_HPP_INCLUDED
 #define AI_HPP_INCLUDED
 
+#include "global.hpp"
+
 #include "actions.hpp"
 #include "ai_interface.hpp"
 

src/ai_attack.cpp

@@ -13,20 +13,11 @@
 
 #include "global.hpp"
 
-#include "actions.hpp"
 #include "ai.hpp"
 #include "game_config.hpp"
 #include "gamestatus.hpp"
-#include "log.hpp"
-#include "pathfind.hpp"
-#include "util.hpp"
 #include "wassert.hpp"
 
-#include <algorithm>
-#include <cstdlib>
-#include <iostream>
-#include <set>
-
 #define LOG_AI LOG_STREAM(info, ai)
 
 const int max_positions = 10000;

src/ai_dfool.cpp

@@ -1,4 +1,3 @@
-#include "global.hpp"
 #include "ai_dfool.hpp"
 
 namespace dfool {

src/ai_dfool.hpp

@@ -1,6 +1,8 @@
 #ifndef AI_DFOOL_HPP_INCLUDED
 #define AI_DFOOL_HPP_INCLUDED
 
+#include "global.hpp"
+
 #include "ai_interface.hpp"
 #include "map.hpp"
 #include <vector>

src/ai_interface.hpp

@@ -16,7 +16,6 @@
 class display;
 class gamemap;
 #include "pathfind.hpp"
-#include "unit.hpp"
 
 class ai_interface {
 public:

src/config.hpp

@@ -13,6 +13,8 @@
 #ifndef CONFIG_HPP_INCLUDED
 #define CONFIG_HPP_INCLUDED
 
+#include "global.hpp"
+
 #include <map>
 #include <string>
 #include <vector>

src/editor/editor.cpp

@@ -1184,7 +1184,7 @@ bool map_editor::verify_filename(const std::string& filename, bool show_error) c
 {
 	static const std::string allowed_characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_/\\.";
 	static const std::string prefix = "\\/";
-	std::size_t start_pos = filename.find_last_of(prefix);
+	size_t start_pos = filename.find_last_of(prefix);
 
 	if(filename.find_first_not_of(allowed_characters, start_pos) != std::string::npos) {
 		if(show_error) {

src/editor/editor.hpp

@@ -12,6 +12,8 @@
 #ifndef EDITOR_H_INCLUDED
 #define EDITOR_H_INCLUDED
 
+#include "global.hpp"
+
 #include "SDL.h"
 
 #include "editor_palettes.hpp"

src/editor/editor_layout.cpp

@@ -10,9 +10,8 @@
   See the COPYING file for more details.
 */
 
-#include "../util.hpp"
-
 #include "editor_layout.hpp"
+#include "util.hpp"
 
 
 namespace {

src/editor/editor_layout.hpp

@@ -10,11 +10,13 @@
   See the COPYING file for more details.
 */
 
-#include "../display.hpp"
-
 #ifndef EDITOR_LAYOUT_H_INCLUDED
 #define EDITOR_LAYOUT_H_INCLUDED
 
+#include "global.hpp"
+
+#include "display.hpp"
+
 namespace map_editor {
 
 /// Size specifications for the map editor.

src/editor/editor_palettes.hpp

@@ -13,6 +13,8 @@
 #ifndef EDITOR_PALETTES_H_INCLUDED
 #define EDITOR_PALETTES_H_INCLUDED
 
+#include "global.hpp"
+
 #include "SDL.h"
 
 #include "../sdl_utils.hpp"

src/editor/editor_undo.hpp

@@ -16,7 +16,9 @@
 #ifndef EDITOR_UNDO_H_INCLUDED
 #define EDITOR_UNDO_H_INCLUDED
 
-#include "../map.hpp"
+#include "global.hpp"
+
+#include "map.hpp"
 
 #include <queue>
 #include <vector>

src/editor/map_manip.cpp

@@ -10,13 +10,13 @@
   See the COPYING file for more details.
 */
 
+#include "map_manip.hpp"
+
 #include "../map.hpp"
 #include "../config.hpp"
 #include "../util.hpp"
 #include "serialization/string_utils.hpp"
 
-#include "map_manip.hpp"
-
 #include <vector>
 #include <map>
 #include <algorithm>

src/editor/map_manip.hpp

@@ -13,6 +13,8 @@
 #ifndef MAP_MANIP_H_INCLUDED
 #define MAP_MANIP_H_INCLUDED
 
+#include "global.hpp"
+
 #include "../map.hpp"
 
 #include <vector>

src/font.hpp

@@ -14,7 +14,7 @@
 #define FONT_HPP_INCLUDED
 
 #include "SDL.h"
-#include "SDL_ttf.h"
+#include "sdl_ttf/SDL_ttf.h"
 
 class CVideo;
 #include "sdl_utils.hpp"

src/game.cpp

@@ -16,52 +16,36 @@
 #include "SDL.h"
 
 #include "about.hpp"
-#include "actions.hpp"
-#include "ai_interface.hpp"
 #include "config.hpp"
 #include "cursor.hpp"
 #include "dialogs.hpp"
 #include "display.hpp"
-#include "events.hpp"
 #include "filesystem.hpp"
 #include "font.hpp"
 #include "game_config.hpp"
 #include "game_errors.hpp"
-#include "game_events.hpp"
 #include "gamestatus.hpp"
 #include "gettext.hpp"
 #include "hotkeys.hpp"
 #include "intro.hpp"
-#include "key.hpp"
 #include "language.hpp"
-#include "log.hpp"
-#include "mapgen.hpp"
 #include "multiplayer.hpp"
 #include "network.hpp"
-#include "pathfind.hpp"
 #include "playcampaign.hpp"
 #include "preferences_display.hpp"
 #include "publish_campaign.hpp"
 #include "replay.hpp"
-#include "show_dialog.hpp"
 #include "sound.hpp"
 #include "statistics.hpp"
-#include "team.hpp"
 #include "thread.hpp"
 #include "titlescreen.hpp"
 #include "util.hpp"
-#include "unit_types.hpp"
-#include "unit.hpp"
-#include "video.hpp"
 #include "wassert.hpp"
 #include "wml_separators.hpp"
 #include "serialization/binary_or_text.hpp"
 #include "serialization/binary_wml.hpp"
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
-#include "serialization/string_utils.hpp"
-#include "widgets/button.hpp"
-#include "widgets/menu.hpp"
 
 #include "wesconfig.h"
 

src/playlevel.cpp

@@ -16,34 +16,23 @@
 #include "ai_interface.hpp"
 #include "config_adapter.hpp"
 #include "cursor.hpp"
-//#include "dialogs.hpp"
-//#include "events.hpp"
 #include "filesystem.hpp"
-//#include "game_errors.hpp"
-//#include "gamestatus.hpp"
 #include "gettext.hpp"
 #include "game_events.hpp"
 #include "halo.hpp"
 #include "help.hpp"
-//#include "hotkeys.hpp"
 #include "intro.hpp"
 #include "log.hpp"
-//#include "mapgen.hpp"
 #include "map_create.hpp"
 #include "marked-up_text.hpp"
-//#include "network.hpp"
 #include "playlevel.hpp"
 #include "playturn.hpp"
 #include "preferences_display.hpp"
-//#include "random.hpp"
 #include "replay.hpp"
 #include "scoped_resource.hpp"
 #include "sound.hpp"
 #include "statistics.hpp"
 #include "tooltips.hpp"
-//#include "unit_display.hpp"
-//#include "util.hpp"
-//#include "video.hpp"
 
 #include <iostream>
 #include <iterator>

src/playturn.cpp

@@ -27,7 +27,6 @@
 #include "minimap.hpp"
 #include "marked-up_text.hpp"
 #include "mouse.hpp"
-#include "network.hpp"
 #include "playlevel.hpp"
 #include "playturn.hpp"
 #include "preferences_display.hpp"

src/replay.cpp

@@ -20,7 +20,6 @@
 #include "game_config.hpp"
 #include "game_events.hpp"
 #include "log.hpp"
-#include "network.hpp"
 #include "pathfind.hpp"
 #include "playlevel.hpp"
 #include "playturn.hpp"

src/replay_controller.cpp

@@ -3,35 +3,23 @@
 #include "ai_interface.hpp"
 #include "config_adapter.hpp"
 #include "cursor.hpp"
-//#include "dialogs.hpp"
-//#include "events.hpp"
 #include "filesystem.hpp"
-//#include "game_errors.hpp"
-//#include "gamestatus.hpp"
 #include "gettext.hpp"
 #include "game_events.hpp"
 #include "halo.hpp"
 #include "help.hpp"
-//#include "hotkeys.hpp"
 #include "intro.hpp"
 #include "log.hpp"
-//#include "mapgen.hpp"
 #include "map_create.hpp"
-//#include "network.hpp"
 #include "playlevel.hpp"
 #include "playturn.hpp"
 #include "preferences.hpp"
 #include "preferences_display.hpp"
-//#include "random.hpp"
 #include "replay.hpp"
 #include "replay_controller.hpp"
-//#include "scoped_resource.hpp"
 #include "sound.hpp"
 #include "statistics.hpp"
 #include "tooltips.hpp"
-//#include "unit_display.hpp"
-//#include "util.hpp"
-//#include "video.hpp"
 
 #include <iostream>
 #include <iterator>
@@ -356,7 +344,8 @@ void replay_controller::play_replay(){
 		} //end for loop
 		is_playing_ = false;
 	}
-	catch(end_level_exception&){
+	catch(end_level_exception& e){
+		if (e.result == QUIT) { throw e; }
 	}
 }
 

src/serialization/string_utils.cpp

@@ -19,10 +19,10 @@
 #include <sstream>
 #include "SDL_types.h"
 
-#include "../gettext.hpp"
-#include "../util.hpp"
-#include "../log.hpp"
-#include "string_utils.hpp"
+#include "gettext.hpp"
+#include "util.hpp"
+#include "log.hpp"
+#include "serialization/string_utils.hpp"
 
 #define ERR_GENERAL LOG_STREAM(err, general)
 

src/serialization/string_utils.hpp

@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "SDL_types.h"
-#include "tstring.hpp"
-#include "util.hpp"
+#include "../tstring.hpp"
+#include "../util.hpp"
 
 class variable_set
 {

src/serialization/tokenizer.cpp

@@ -13,8 +13,8 @@
 
 #include "global.hpp"
 
-#include "tokenizer.hpp"
-#include "string_utils.hpp"
+#include "serialization/tokenizer.hpp"
+#include "serialization/string_utils.hpp"
 
 #include <iostream>
 #include <sstream>

src/show_dialog.cpp

@@ -40,7 +40,7 @@
 #include "widgets/textbox.hpp"
 #include "wassert.hpp"
 
-#include "SDL_ttf.h"
+#include "sdl_ttf/SDL_ttf.h"
 
 #include <iostream>
 #include <numeric>

src/titlescreen.cpp

@@ -33,7 +33,7 @@
 #include "serialization/parser.hpp"
 #include "serialization/preprocessor.hpp"
 
-#include "SDL_ttf.h"
+#include "sdl_ttf/SDL_ttf.h"
 
 #define LOG_DP LOG_STREAM(info, display)
 #define ERR_DP LOG_STREAM(err, display)

src/unit_types.cpp

@@ -188,7 +188,6 @@ attack_type::attack_type(const config& cfg)
 	if(icon_.empty())
 		icon_ = "attacks/" + id_ + ".png";
 	
-#warning "range type should disapear soon"
 	if(cfg["range"] == "long" || cfg["range"] == "ranged") {
 		range_type_ = LONG_RANGE;
 	} else {

src/widgets/button.cpp

@@ -11,16 +11,16 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "button.hpp"
+#include "widgets/button.hpp"
 #include "font.hpp"
-#include "../marked-up_text.hpp"
-#include "../image.hpp"
-#include "../log.hpp"
-#include "../util.hpp"
-#include "../video.hpp"
-#include "../wml_separators.hpp"
+#include "marked-up_text.hpp"
+#include "image.hpp"
+#include "log.hpp"
+#include "util.hpp"
+#include "video.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 namespace gui {

src/widgets/combo.cpp

@@ -11,13 +11,12 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "combo.hpp"
-#include "button.hpp"
-#include "../display.hpp"
-#include "../show_dialog.hpp"
-#include "../video.hpp"
+#include "widgets/combo.hpp"
+#include "display.hpp"
+#include "show_dialog.hpp"
+#include "video.hpp"
 
 namespace gui {
 

src/widgets/file_chooser.cpp

@@ -10,19 +10,19 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "../display.hpp"
-#include "../events.hpp"
-#include "../filesystem.hpp"
-#include "../gettext.hpp"
-#include "../key.hpp"
-#include "../marked-up_text.hpp"
-#include "../show_dialog.hpp"
-#include "../wml_separators.hpp"
-#include "file_chooser.hpp"
+#include "display.hpp"
+#include "events.hpp"
+#include "filesystem.hpp"
+#include "gettext.hpp"
+#include "key.hpp"
+#include "marked-up_text.hpp"
+#include "show_dialog.hpp"
+#include "wml_separators.hpp"
+#include "widgets/file_chooser.hpp"
 
 #include <sstream>
 #include <cstdio>

src/widgets/image_button.cpp

@@ -11,15 +11,15 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "image_button.hpp"
-#include "../font.hpp"
-#include "../image.hpp"
-#include "../log.hpp"
-#include "../util.hpp"
-#include "../video.hpp"
-#include "../wml_separators.hpp"
+#include "widgets/image_button.hpp"
+#include "font.hpp"
+#include "image.hpp"
+#include "log.hpp"
+#include "util.hpp"
+#include "video.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 namespace gui {

src/widgets/label.cpp

@@ -11,11 +11,11 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "label.hpp"
-#include "../marked-up_text.hpp"
-#include "../video.hpp"
+#include "widgets/label.hpp"
+#include "marked-up_text.hpp"
+#include "video.hpp"
 
 namespace gui {
 

src/widgets/menu.cpp

@@ -11,18 +11,18 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "menu.hpp"
+#include "widgets/menu.hpp"
 
-#include "../language.hpp"
-#include "../font.hpp"
-#include "../image.hpp"
-#include "../marked-up_text.hpp"
-#include "../sdl_utils.hpp"
-#include "../util.hpp"
-#include "../video.hpp"
-#include "../wml_separators.hpp"
+#include "language.hpp"
+#include "font.hpp"
+#include "image.hpp"
+#include "marked-up_text.hpp"
+#include "sdl_utils.hpp"
+#include "util.hpp"
+#include "video.hpp"
+#include "wml_separators.hpp"
 #include "serialization/string_utils.hpp"
 
 #include <algorithm>

src/widgets/progressbar.cpp

@@ -11,14 +11,14 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "progressbar.hpp"
+#include "widgets/progressbar.hpp"
 
-#include "../font.hpp"
-#include "../marked-up_text.hpp"
-#include "../util.hpp"
-#include "../video.hpp"
+#include "font.hpp"
+#include "marked-up_text.hpp"
+#include "util.hpp"
+#include "video.hpp"
 
 namespace gui {
 

src/widgets/scrollarea.cpp

@@ -11,9 +11,9 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "scrollarea.hpp"
+#include "widgets/scrollarea.hpp"
 
 #include <algorithm>
 #include <iostream>

src/widgets/scrollbar.cpp

@@ -12,11 +12,11 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "scrollbar.hpp"
-#include "../image.hpp"
-#include "../video.hpp"
+#include "widgets/scrollbar.hpp"
+#include "image.hpp"
+#include "video.hpp"
 
 #include <algorithm>
 #include <iostream>

src/widgets/scrollpane.cpp

@@ -11,11 +11,11 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
 #include <algorithm>
 
-#include "scrollpane.hpp"
+#include "widgets/scrollpane.hpp"
 
 namespace {
 class widget_finder {

src/widgets/slider.cpp

@@ -11,11 +11,11 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "slider.hpp"
-#include "../image.hpp"
-#include "../video.hpp"
+#include "widgets/slider.hpp"
+#include "image.hpp"
+#include "video.hpp"
 
 #include <algorithm>
 #include <iostream>

src/widgets/textbox.cpp

@@ -11,17 +11,17 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "textbox.hpp"
-#include "../clipboard.hpp"
-#include "../font.hpp"
-#include "../language.hpp"
-#include "../log.hpp"
-#include "../sdl_utils.hpp"
-#include "../serialization/string_utils.hpp"
-#include "../util.hpp"
-#include "../video.hpp"
+#include "widgets/textbox.hpp"
+#include "clipboard.hpp"
+#include "font.hpp"
+#include "language.hpp"
+#include "log.hpp"
+#include "sdl_utils.hpp"
+#include "serialization/string_utils.hpp"
+#include "util.hpp"
+#include "video.hpp"
 
 #include "SDL.h"
 

src/widgets/widget.cpp

@@ -11,10 +11,10 @@
    See the COPYING file for more details.
 */
 
-#include "../global.hpp"
+#include "global.hpp"
 
-#include "widget.hpp"
-#include "../video.hpp"
+#include "widgets/widget.hpp"
+#include "video.hpp"
 
 namespace {
 	const SDL_Rect EmptyRect = {-1234,-1234,0,0};

wesnoth.dsp

@@ -1,24 +1,24 @@
 # Microsoft Developer Studio Project File - Name="wesnoth" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=wesnoth - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+CFG=wesnoth - Win32 Release
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
 !MESSAGE 
 !MESSAGE NMAKE /f "wesnoth.mak".
 !MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
 !MESSAGE 
-!MESSAGE NMAKE /f "wesnoth.mak" CFG="wesnoth - Win32 Debug"
+!MESSAGE NMAKE /f "wesnoth.mak" CFG="wesnoth - Win32 Release"
 !MESSAGE 
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
 !MESSAGE 
-!MESSAGE "wesnoth - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "wesnoth - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "wesnoth - Win32 Debug" (basierend auf  "Win32 (x86) Application")
+!MESSAGE "wesnoth - Win32 Release" (basierend auf  "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -29,34 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "wesnoth - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Ot /Oa /Ow /Og /Oi /Op /Oy /I "f:/projets/gpl/wesnoth/wesnoth-trunk/src" /I "f:/projets/include/sdl" /I "f:/projets/include" /I "f:/projets/gpl/wesnoth/wesnoth-trunk/src/sdl_ttf" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /c
-# SUBTRACT CPP /Ox
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib /nologo /subsystem:windows /machine:I386 /out:"wesnoth.exe" /libpath:"f:\projets\lib"
-
-!ELSEIF  "$(CFG)" == "wesnoth - Win32 Debug"
+!IF  "$(CFG)" == "wesnoth - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -70,7 +43,7 @@ LINK32=link.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 /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" /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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -80,14 +53,41 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib python24.lib /nologo /subsystem:windows /debug /machine:I386 /out:"wesnoth.exe" /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "wesnoth - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"wesnoth.exe" /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib SDL.lib SDLmain.lib SDL_mixer.lib SDL_net.lib SDL_image.lib libintl.lib freetype.lib Ws2_32.lib fribidi.lib /nologo /subsystem:windows /debug /machine:I386 /out:"wesnoth.exe" /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "wesnoth - Win32 Release"
 # Name "wesnoth - Win32 Debug"
+# Name "wesnoth - Win32 Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -117,6 +117,10 @@ SOURCE=.\src\ai_move.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\ai_python.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\animated.cpp
 # End Source File
 # Begin Source File
@@ -557,6 +561,10 @@ SOURCE=.\src\ai_move.hpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\ai_python.hpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\animated.hpp
 # End Source File
 # Begin Source File

wesnoth.dsw

@@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
+Project: "Map Editor"=".\Map Editor.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "wesnoth"=.\wesnoth.dsp - Package Owner=<4>
 
 Package=<5>