************************************************************

* Merged Source Code from Development Trunk: Revision 4063 * ************************************************************ - Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP - This will be the Source for the Beta 2011 Test git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2026-08-19 14:20:30 +02:00 · 2011-01-18 09:11:09 +00:00
parent 44e1646410
commit 91087ca8c0
469 changed files with 118108 additions and 24678 deletions
@@ -33,6 +33,8 @@
 	#include "EditorMapInfo.h"
 #endif

+#include "LoadScreen.h"
+
 extern SOLDIERINITNODE *gpSelected;
 extern SCHEDULENODE gCurrSchedule;
 extern void ExtractAndUpdateMercSchedule();
@@ -648,8 +650,17 @@ void BtnChangeTilesetCallback(GUI_BUTTON *btn,INT32 reason)
 {
 	if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN)
 	{
-		btn->uiFlags |= BUTTON_CLICKED_ON;
-		iEditorToolbarState = TBAR_MODE_CHANGE_TILESET;
+		// WANNE: Check if map has been saved when we have a new map that has not been saved before!
+		if (fNewMapSaved)
+		{
+			btn->uiFlags |= BUTTON_CLICKED_ON;
+			iEditorToolbarState = TBAR_MODE_CHANGE_TILESET;
+		}
+		else
+		{
+			swprintf(gzErrorCatchString, L"Before changing tilesets you have to save the new map!");
+			InitErrorCatchDialog();
+		}
 	}
 }

@@ -708,7 +708,7 @@ void InitEditorOptionsToolbar()
 	//dnl ch33 160909
 	iEditorButton[OPTIONS_VANILLA_MODE] =
 		CreateCheckBoxButton(iScreenWidthOffset+71, SCREEN_HEIGHT-119, "EDITOR//smcheckbox.sti", MSYS_PRIORITY_NORMAL, VanillaModeCallback);
-	SetButtonFastHelpText(iEditorButton[OPTIONS_VANILLA_MODE],L"Set save map as v1.12");
+	SetButtonFastHelpText(iEditorButton[OPTIONS_VANILLA_MODE],L"When checked, the map will be saved in original JA2 format (Version: 5.00 / 25)");
 }

 void InitEditorTerrainToolbar()
@@ -906,7 +906,7 @@ void RenderEditorInfo( )
 	switch( iCurrentTaskbar )
 	{
 		case TASK_OPTIONS:
-			mprintf(iScreenWidthOffset+71+15, SCREEN_HEIGHT-117, L"v1.12");//dnl ch33 160909
+			mprintf(iScreenWidthOffset+71+15, SCREEN_HEIGHT-117, L"Save map in original JA2 map format (Version: 5.00 / 25)");//dnl ch33 160909
 			if( !gfWorldLoaded || giCurrentTilesetID < 0 )
 				mprintf( iScreenWidthOffset + 260, 2 * iScreenHeightOffset + 445, L"No map currently loaded." );
 			else
@@ -45,7 +45,7 @@
 	#include "InterfaceItemImages.h"
 #endif

-#include "VFS/Tools/Log.h"
+#include <vfs/Tools/vfs_log.h>

 #define NUMBER_TRIGGERS			27
 #define PRESSURE_ACTION_ID	(NUMBER_TRIGGERS - 1)
@@ -557,10 +557,10 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 				}
 				else
 				{
-					static CLog& editorLog = *CLog::create(L"EditorItems.log");
+					static vfs::Log& editorLog = *vfs::Log::create(L"EditorItems.log");
 					editorLog	<< L"Tried to access item [" 
 								<< item->ubGraphicNum << L"/" << hVObject->usNumberOfObjects 
-								<< L"]" << CLog::ENDL;
+								<< L"]" << vfs::Log::endl;
 				}
 			}
 			usCounter++;
@@ -141,7 +141,7 @@ void SetupTextInputForMapInfo()
 	swprintf( str, L"%d", gExitGrid.ubGotoSectorZ );
 	AddTextInputField( iScreenWidthOffset + 338, 2 * iScreenHeightOffset + 383, 30, 18, MSYS_PRIORITY_NORMAL, str, 1, INPUTTYPE_NUMERICSTRICT );
 	swprintf( str, L"%d", gExitGrid.usGridNo );
-	AddTextInputField( iScreenWidthOffset + 338, 2 * iScreenHeightOffset + 403, 40, 18, MSYS_PRIORITY_NORMAL, str, 5, INPUTTYPE_NUMERICSTRICT );
+	AddTextInputField( iScreenWidthOffset + 338, 2 * iScreenHeightOffset + 403, 45, 18, MSYS_PRIORITY_NORMAL, str, 6, INPUTTYPE_NUMERICSTRICT );
 }

 void UpdateMapInfo()
@@ -183,8 +183,8 @@ void UpdateMapInfo()
 	mprintf( iScreenWidthOffset + 368, 2 * iScreenHeightOffset + 372, L"Sector" );
 	mprintf( iScreenWidthOffset + 368, 2 * iScreenHeightOffset + 383, L"Destination");
 	mprintf( iScreenWidthOffset + 368, 2 * iScreenHeightOffset + 392, L"Bsmt. Level" );
-	mprintf( iScreenWidthOffset + 378, 2 * iScreenHeightOffset + 403, L"Dest." );
-	mprintf( iScreenWidthOffset + 378, 2 * iScreenHeightOffset + 412, L"GridNo" );
+	mprintf( iScreenWidthOffset + 383, 2 * iScreenHeightOffset + 403, L"Dest." );
+	mprintf( iScreenWidthOffset + 383, 2 * iScreenHeightOffset + 412, L"GridNo" );
 	SetFontForeground( FONT_RED );
 }

@@ -77,6 +77,11 @@ extern void GetSoldierAboveGuyPositions( SOLDIERTYPE *pSoldier, INT16 *psX, INT1
 //	SANMONA_ARMS_GROUP,
 //	ANGELS_GROUP,
 //	NUM_CIV_GROUPS
+
+CHAR16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 128 ];
+
+
+/*
 CHAR16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] =
 {
 	L"NONE",
@@ -102,7 +107,7 @@ CHAR16 gszCivGroupNames[ NUM_CIV_GROUPS ][ 20 ] =
 	L"UNUSED18",
 	L"UNUSED19",
 };
-
+*/
 //--------------------------------------------------

 //	SCHEDULE_ACTION_NONE,
@@ -311,6 +316,27 @@ extern SOLDIERCREATE_STRUCT gSaveBufferDetailedPlacement;
 //void CopyMercPlacement(); // moved to header (jonathanl)
 //void PasteMercPlacement(); // moved to header (jonathanl)

+
+//legion2 jazz
+
+wchar_t *GetGrupaString( SOLDIERTYPE *pSoldier ) //Legion 2
+{
+	INT32 cnt, cntStart,par;
+	
+	cntStart = 0;
+	for ( cnt = cntStart; cnt < NUM_CIV_GROUPS; cnt ++ )
+	{
+			if (pSoldier->ubCivilianGroup == cnt)	
+			{
+			par = cnt;
+			}
+			
+	}
+	return gszCivGroupNames[ par ];
+}
+//------------
+
+
 void GameInitEditorMercsInfo()
 {
 	INT32 i;
@@ -3106,7 +3132,7 @@ void RenderMercStrings()
 	SOLDIERTYPE								*pSoldier;
 	INT16 sXPos, sYPos;
 	INT16 sX, sY;
-	STR16 pStr;
+	STR16 pStr, pStr2;
 	SOLDIERINITNODE *curr;
 	CHAR16 str[50];

@@ -3154,6 +3180,24 @@ void RenderMercStrings()
 					mprintf( sX, sY, str );
 				}
 				sYPos += 10;
+				
+				
+				if (pSoldier->bTeam == CIV_TEAM )
+				{
+				//legion2
+				pStr2 = GetGrupaString( pSoldier );
+				
+				SetFontBackground( FONT_MCOLOR_BLACK );
+				SetFontForeground( FONT_YELLOW ); //FONT_MCOLOR_WHITE
+				FindFontCenterCoordinates( sXPos, sYPos, 80, 1, pStr2, TINYFONT1, &sX, &sY );
+				if( sY < (2 * iScreenHeightOffset + 352 ))
+				{
+					gprintfdirty( sX, sY, pStr2 );
+					mprintf( sX, sY, pStr2 );
+				}
+				sYPos += 10;
+				}
+				
 			}
 			else
 			{
@@ -3180,6 +3224,25 @@ void RenderMercStrings()
 					mprintf( sX, sY, str );
 				}
 				sYPos += 10;
+				
+				//legion
+				if (pSoldier->bTeam == CIV_TEAM ) //(pSoldier->bTeam == ENEMY_TEAM || pSoldier->bTeam == CREATURE_TEAM || pSoldier->bTeam == MILITIA_TEAM) 
+				{		
+				//legion 2
+				pStr2 = GetGrupaString( pSoldier );
+				
+				//SetFont( TINYFONT1 );
+				SetFontBackground( FONT_MCOLOR_BLACK );
+				SetFontForeground( FONT_YELLOW ); //FONT_MCOLOR_WHITE
+				FindFontCenterCoordinates( sXPos, sYPos, 80, 1, pStr2, TINYFONT1, &sX, &sY );
+				if( sY < (2 * iScreenHeightOffset + 352 ))
+				{
+					gprintfdirty( sX, sY, pStr2 );
+					mprintf( sX, sY, pStr2 );
+				}
+				sYPos += 10;
+				}
+				
 			}
 			if( curr->pBasicPlacement->bOrders == RNDPTPATROL || curr->pBasicPlacement->bOrders == POINTPATROL )
 			{ //make sure the placement has at least one waypoint.
@@ -3302,7 +3365,7 @@ void CancelCurrentScheduleAction()

 void RegisterCurrentScheduleAction( INT32 iMapIndex )
 {
-	CHAR16 str[6];
+	CHAR16 str[10];
 	MarkWorldDirty();
 	swprintf( str, L"%d", iMapIndex );
 	if( gfUseScheduleData2 )
@@ -0,0 +1,559 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="Editor"
+	ProjectGUID="{60D793F2-90B4-43C9-83B5-221EE11B37E6}"
+	RootNamespace="Editor"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\lib\VS2005\$(ConfigurationName)"
+			IntermediateDirectory="..\build\VS2005\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\ja2.vsprops;..\ja2_Debug.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\lib\VS2005\$(ConfigurationName)"
+			IntermediateDirectory="..\build\VS2005\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\ja2.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				RuntimeLibrary="0"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="MapEditor|Win32"
+			OutputDirectory="..\lib\VS2005\$(ConfigurationName)"
+			IntermediateDirectory="..\build\VS2005\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\ja2.vsprops;..\ja2_Editor.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				RuntimeLibrary="0"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="MapEditorD|Win32"
+			OutputDirectory="..\lib\VS2005\$(ConfigurationName)"
+			IntermediateDirectory="..\build\VS2005\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\ja2.vsprops;..\ja2_Editor.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4100"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_WithDebugInfo|Win32"
+			OutputDirectory="..\lib\VS2005\$(ConfigurationName)"
+			IntermediateDirectory="..\build\VS2005\$(ProjectName)_$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="..\ja2.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+				RuntimeLibrary="0"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\Button Defines.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Cursor Modes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\edit_sys.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor All.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Callback Prototypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Modes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Taskbar Creation.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Taskbar Utils.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Undo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorBuildings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorDefines.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorItems.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorMapInfo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorMercs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorTerrain.h"
+				>
+			</File>
+			<File
+				RelativePath=".\editscreen.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Item Statistics.h"
+				>
+			</File>
+			<File
+				RelativePath=".\LoadScreen.h"
+				>
+			</File>
+			<File
+				RelativePath=".\messagebox.h"
+				>
+			</File>
+			<File
+				RelativePath=".\newsmooth.h"
+				>
+			</File>
+			<File
+				RelativePath=".\popupmenu.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Road Smoothing.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Sector Summary.h"
+				>
+			</File>
+			<File
+				RelativePath=".\selectwin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\SmartMethod.h"
+				>
+			</File>
+			<File
+				RelativePath=".\smooth.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Smoothing Utils.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Summary Info.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\Cursor Modes.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\edit_sys.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Callbacks.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Modes.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Taskbar Creation.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Taskbar Utils.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Editor Undo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorBuildings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorItems.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorMapInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorMercs.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\EditorTerrain.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\editscreen.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Item Statistics.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\LoadScreen.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\messagebox.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\newsmooth.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\popupmenu.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Road Smoothing.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Sector Summary.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\selectwin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\SmartMethod.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\smooth.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Smoothing Utils.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
@@ -21,7 +21,7 @@
 			OutputDirectory="..\lib\VS2008\$(ConfigurationName)"
 			IntermediateDirectory="..\build\VS2008\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Debug.vsprops"
+			InheritedPropertySheets="..\ja2.vsprops;..\ja2_Debug.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -83,7 +83,7 @@
 			OutputDirectory="..\lib\VS2008\$(ConfigurationName)"
 			IntermediateDirectory="..\build\VS2008\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			InheritedPropertySheets="..\ja2.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="0"
 			>
@@ -147,7 +147,7 @@
 			OutputDirectory="..\lib\VS2008\$(ConfigurationName)"
 			IntermediateDirectory="..\build\VS2008\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			InheritedPropertySheets="..\ja2.vsprops;..\ja2_Editor.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="0"
 			>
@@ -211,7 +211,7 @@
 			OutputDirectory="..\lib\VS2008\$(ConfigurationName)"
 			IntermediateDirectory="..\build\VS2008\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops;..\ja2_VS2008Editor.vsprops"
+			InheritedPropertySheets="..\ja2.vsprops;..\ja2_Editor.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -273,7 +273,7 @@
 			OutputDirectory="..\lib\VS2008\$(ConfigurationName)"
 			IntermediateDirectory="..\build\VS2008\$(ProjectName)_$(ConfigurationName)"
 			ConfigurationType="4"
-			InheritedPropertySheets="..\ja2_VS2008.vsprops"
+			InheritedPropertySheets="..\ja2.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="0"
 			>
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MapEditorD|Win32">
+      <Configuration>MapEditorD</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="MapEditor|Win32">
+      <Configuration>MapEditor</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Relese_WithDebugInfo|Win32">
+      <Configuration>Relese_WithDebugInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Button Defines.h" />
+    <ClInclude Include="Cursor Modes.h" />
+    <ClInclude Include="Editor All.h" />
+    <ClInclude Include="Editor Callback Prototypes.h" />
+    <ClInclude Include="Editor Modes.h" />
+    <ClInclude Include="Editor Taskbar Creation.h" />
+    <ClInclude Include="Editor Taskbar Utils.h" />
+    <ClInclude Include="Editor Undo.h" />
+    <ClInclude Include="EditorBuildings.h" />
+    <ClInclude Include="EditorDefines.h" />
+    <ClInclude Include="EditorItems.h" />
+    <ClInclude Include="EditorMapInfo.h" />
+    <ClInclude Include="EditorMercs.h" />
+    <ClInclude Include="EditorTerrain.h" />
+    <ClInclude Include="editscreen.h" />
+    <ClInclude Include="edit_sys.h" />
+    <ClInclude Include="Item Statistics.h" />
+    <ClInclude Include="LoadScreen.h" />
+    <ClInclude Include="messagebox.h" />
+    <ClInclude Include="newsmooth.h" />
+    <ClInclude Include="popupmenu.h" />
+    <ClInclude Include="Road Smoothing.h" />
+    <ClInclude Include="Sector Summary.h" />
+    <ClInclude Include="selectwin.h" />
+    <ClInclude Include="SmartMethod.h" />
+    <ClInclude Include="smooth.h" />
+    <ClInclude Include="Smoothing Utils.h" />
+    <ClInclude Include="Summary Info.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Cursor Modes.cpp" />
+    <ClCompile Include="Editor Callbacks.cpp" />
+    <ClCompile Include="Editor Modes.cpp" />
+    <ClCompile Include="Editor Taskbar Creation.cpp" />
+    <ClCompile Include="Editor Taskbar Utils.cpp" />
+    <ClCompile Include="Editor Undo.cpp" />
+    <ClCompile Include="EditorBuildings.cpp" />
+    <ClCompile Include="EditorItems.cpp" />
+    <ClCompile Include="EditorMapInfo.cpp" />
+    <ClCompile Include="EditorMercs.cpp" />
+    <ClCompile Include="EditorTerrain.cpp" />
+    <ClCompile Include="editscreen.cpp" />
+    <ClCompile Include="edit_sys.cpp" />
+    <ClCompile Include="Item Statistics.cpp" />
+    <ClCompile Include="LoadScreen.cpp" />
+    <ClCompile Include="messagebox.cpp" />
+    <ClCompile Include="newsmooth.cpp" />
+    <ClCompile Include="popupmenu.cpp" />
+    <ClCompile Include="Road Smoothing.cpp" />
+    <ClCompile Include="Sector Summary.cpp" />
+    <ClCompile Include="selectwin.cpp" />
+    <ClCompile Include="SmartMethod.cpp" />
+    <ClCompile Include="smooth.cpp" />
+    <ClCompile Include="Smoothing Utils.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{23EA0500-038A-4EB8-B753-0C709B25470D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Editor</RootNamespace>
+    <ProjectName>Editor</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Relese_WithDebugInfo|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\ja2.props" />
+    <Import Project="..\ja2_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\ja2.props" />
+    <Import Project="..\ja2_Debug.props" />
+    <Import Project="..\ja2_Editor.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\ja2.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\ja2.props" />
+    <Import Project="..\ja2_Editor.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Relese_WithDebugInfo|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\ja2.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>..\lib\VS2010\$(Configuration)\</OutDir>
+    <IntDir>..\build\VS2010\$(ProjectName)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'">
+    <OutDir>..\lib\VS2010\$(Configuration)\</OutDir>
+    <IntDir>..\build\VS2010\$(ProjectName)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>..\lib\VS2010\$(Configuration)\</OutDir>
+    <IntDir>..\build\VS2010\$(ProjectName)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'">
+    <OutDir>..\lib\VS2010\$(Configuration)\</OutDir>
+    <IntDir>..\build\VS2010\$(ProjectName)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Relese_WithDebugInfo|Win32'">
+    <OutDir>..\lib\VS2010\$(Configuration)\</OutDir>
+    <IntDir>..\build\VS2010\$(ProjectName)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MapEditorD|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='MapEditor|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Relese_WithDebugInfo|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>Disabled</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{1305164a-0ad7-4d96-af15-765647f97f27}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{02bb6629-3e96-4c7d-931f-fb1ec12b8ef5}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Button Defines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Cursor Modes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="edit_sys.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Editor All.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Editor Callback Prototypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Editor Modes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Editor Taskbar Creation.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Editor Taskbar Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Editor Undo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorBuildings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorDefines.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorItems.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorMapInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorMercs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="EditorTerrain.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="editscreen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Item Statistics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LoadScreen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="messagebox.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="newsmooth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="popupmenu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Road Smoothing.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Sector Summary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="selectwin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SmartMethod.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="smooth.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Smoothing Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Summary Info.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Cursor Modes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="edit_sys.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Editor Callbacks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Editor Modes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Editor Taskbar Creation.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Editor Taskbar Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Editor Undo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EditorBuildings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EditorItems.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EditorMapInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EditorMercs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EditorTerrain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="editscreen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Item Statistics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LoadScreen.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="messagebox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="newsmooth.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="popupmenu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Road Smoothing.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Sector Summary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="selectwin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SmartMethod.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="smooth.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Smoothing Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
@@ -671,7 +671,7 @@ void SetupGunGUI()
 	//for a particular weapon.	Show only the ones that we can apply to this gun.
 	yp = 2 * iScreenHeightOffset + 383;
 	guiAttachmentButton[ SILENCER_ATTACHMENT_BUTTON ] = -1;
-	if( ValidAttachment( SILENCER, gpItem->usItem ) )
+	if( ValidAttachment( SILENCER, gpItem ) )
 	{
 		guiAttachmentButton[ SILENCER_ATTACHMENT_BUTTON ] =
 			CreateTextButton( L"SILENCER", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -684,7 +684,7 @@ void SetupGunGUI()
 		}
 	}
 	guiAttachmentButton[ SNIPERSCOPE_ATTACHMENT_BUTTON ] = -1;
-	if( ValidAttachment( SNIPERSCOPE, gpItem->usItem ) )
+	if( ValidAttachment( SNIPERSCOPE, gpItem ) )
 	{
 		guiAttachmentButton[ SNIPERSCOPE_ATTACHMENT_BUTTON ] =
 			CreateTextButton( L"SNIPERSCOPE", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -697,7 +697,7 @@ void SetupGunGUI()
 		}
 	}
 	guiAttachmentButton[ LASERSCOPE_ATTACHMENT_BUTTON ] = -1;
-	if( ValidAttachment( LASERSCOPE, gpItem->usItem ) )
+	if( ValidAttachment( LASERSCOPE, gpItem ) )
 	{
 		guiAttachmentButton[ LASERSCOPE_ATTACHMENT_BUTTON ] =
 			CreateTextButton( L"LASERSCOPE", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -710,7 +710,7 @@ void SetupGunGUI()
 		}
 	}
 	guiAttachmentButton[ BIPOD_ATTACHMENT_BUTTON ] = -1;
-	if( ValidAttachment( BIPOD, gpItem->usItem ) )
+	if( ValidAttachment( BIPOD, gpItem ) )
 	{
 		guiAttachmentButton[ BIPOD_ATTACHMENT_BUTTON ] =
 			CreateTextButton( L"BIPOD", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -723,7 +723,7 @@ void SetupGunGUI()
 		}
 	}
 	guiAttachmentButton[ DUCKBILL_ATTACHMENT_BUTTON ] = -1;
-	if( ValidAttachment( DUCKBILL, gpItem->usItem ) )
+	if( ValidAttachment( DUCKBILL, gpItem ) )
 	{
 		guiAttachmentButton[ DUCKBILL_ATTACHMENT_BUTTON ] =
 			CreateTextButton( L"DUCKBILL", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -736,7 +736,7 @@ void SetupGunGUI()
 		}
 	}
 	guiAttachmentButton[ GLAUNCHER_ATTACHMENT_BUTTON ] = -1;
-	if( ValidAttachment( UNDER_GLAUNCHER, gpItem->usItem ) )
+	if( ValidAttachment( UNDER_GLAUNCHER, gpItem ) )
 	{
 		guiAttachmentButton[ GLAUNCHER_ATTACHMENT_BUTTON ] =
 			CreateTextButton( L"G-LAUNCHER", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -855,7 +855,7 @@ void SetupArmourGUI()
 	}

 	guiCeramicPlatesButton = -1;
-	if( ValidAttachment( CERAMIC_PLATES, gpItem->usItem ) )
+	if( ValidAttachment( CERAMIC_PLATES, gpItem ) )
 	{
 		guiCeramicPlatesButton =
 			CreateTextButton( L"CERAMIC PLATES", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -1012,7 +1012,7 @@ void SetupExplosivesGUI()
 	yp = 375;
 	gfDetonator = FALSE;
 	guiDetonatorButton = -1;
-	if( ValidAttachment( DETONATOR, gpItem->usItem ) )
+	if( ValidAttachment( DETONATOR, gpItem ) )
 	{
 		guiDetonatorButton =
 			CreateTextButton( L"DETONATOR", SMALLCOMPFONT, FONT_YELLOW, FONT_BLACK, BUTTON_USE_DEFAULT,
@@ -43,9 +43,11 @@
 	#include "Item Statistics.h"
 	#include "Scheduling.h"
 	#include "MessageBoxScreen.h"
-	#include "VFS/vfs.h"//dnl ch37 110909
+	#include <vfs/Core/vfs.h>//dnl ch37 110909
 #endif

+INT16 gsMouseWheelDeltaValue;
+
 //===========================================================================

 BOOLEAN gfErrorCatch = FALSE;
@@ -190,7 +192,7 @@ void LoadSaveScreenEntry()
 		vfs::CVirtualProfile::FileIterator fit = prof->files(L"MAPS/*");
 		while(!fit.end())
 		{
-			utf8string fname = fit.value()->getName().c_str();
+			vfs::String fname = fit.value()->getName().c_str();
 			memset(&FileInfo, 0, sizeof(GETFILESTRUCT));
 			strcpy(FileInfo.zFileName, fname.utf8().c_str());
 			FileInfo.uiFileSize = fname.length();
@@ -1013,8 +1015,7 @@ UINT32 ProcessFileIO()
 					return(EDIT_SCREEN);
 				}
 				gbCurrentFileIOStatus = IOSTATUS_NONE;
-				utf8string msg = utf8string(" Error saving ") + ubNewFilename + utf8string(" file. Try another filename? ");
-				CreateMessageBox((STR16)msg.c_wcs().c_str());
+				CreateMessageBox((STR16)(_BS(L" Error saving ") << (const char*)ubNewFilename << L" file. Try another filename? " << _BS::wget).c_str() );
 				return(guiCurrentScreen);
 			}
 			if( gfShowPits )
@@ -1035,6 +1036,9 @@ UINT32 ProcessFileIO()
 				InitErrorCatchDialog();
 				return EDIT_SCREEN;
 			}
+
+			fNewMapSaved = TRUE;
+
 			return EDIT_SCREEN;
 		case INITIATE_MAP_LOAD: //draw load message
 			SaveFontSettings();
@@ -1056,8 +1060,7 @@ UINT32 ProcessFileIO()
 				gbCurrentFileIOStatus = IOSTATUS_NONE;
 				gfGlobalError = FALSE;
 				gfLoadError = TRUE;
-				utf8string msg = utf8string(" Error loading ") + ubNewFilename + utf8string(" file. Try another filename? ");
-				CreateMessageBox((STR16)msg.c_wcs().c_str());
+				CreateMessageBox((STR16)(_BS(L" Error loading ") << (const char*)ubNewFilename << L" file. Try another filename? " << _BS::wget).c_str());
 				return(guiCurrentScreen);
 			}
 			//ADB these are NOT set yet! but they need to be, duh
@@ -42,6 +42,8 @@ BOOLEAN ValidMapFileName(STR16 szFilename);
 BOOLEAN ExternalLoadMap(STR16 szFilename);
 BOOLEAN ExternalSaveMap(STR16 szFilename);

+void InitErrorCatchDialog();
+
 extern BOOLEAN gfErrorCatch;
 extern CHAR16 gzErrorCatchString[ 256 ];

@@ -39,10 +39,11 @@
 	#include "Soldier Create.h"
 	#include "GameVersion.h"
 	#include "Campaign Types.h"
+	#include "GameSettings.h"
 #endif

-#include "VFS/vfs.h"
-#include "VFS/vfs_file_raii.h"
+#include <vfs/Core/vfs.h>
+#include <vfs/Core/vfs_file_raii.h>

 extern BOOLEAN gfOverheadMapDirty;

@@ -416,9 +417,10 @@ void CreateSummaryWindow()
 	if( gfAutoLoadA9 )
 	{
 		gfAutoLoadA9++;
-		gsSelSectorX = 9;
-		gsSelSectorY = 1;
-		gpCurrentSectorSummary = gpSectorSummary[ 8 ][ 0 ][ 0 ];
+		gsSelSectorX = gGameExternalOptions.ubDefaultArrivalSectorX;//9;
+		gsSelSectorY = gGameExternalOptions.ubDefaultArrivalSectorY;//1;
+		//gpCurrentSectorSummary = gpSectorSummary[ 8 ][ 0 ][ 0 ];
+		gpCurrentSectorSummary = gpSectorSummary[ gGameExternalOptions.ubDefaultArrivalSectorX - 1 ][ gGameExternalOptions.ubDefaultArrivalSectorY - 1 ][ 0 ];
 		ButtonList[ iSummaryButton[ SUMMARY_LOAD ] ]->uiFlags |= BUTTON_CLICKED_ON;
 	}
 }
@@ -761,6 +763,7 @@ void RenderItemDetails()
 						pItem = &gpWorldItemsSummaryArray[ i ].object;
 						uiExistChance += (100 - gpWorldItemsSummaryArray[ i ].ubNonExistChance) * pItem->ubNumberOfObjects;
 						uiStatus += (*pItem)[0]->data.objectStatus;
+						uiQuantity += pItem->ubNumberOfObjects;
 					}
 				}
 			}
@@ -1965,7 +1968,7 @@ void CreateGlobalSummary()
 	vfs::COpenWriteFile wfile(L"DevInfo\\readme.txt",true,true);
 	std::string str = "This information is used in conjunction with the editor.\n";
 	str += "This directory or it's contents shouldn't be included with final release.\n";
-	TRYCATCH_RETHROW( wfile.file().write(str.c_str(), str.length()), L"" );
+	SGP_TRYCATCH_RETHROW( wfile->write(str.c_str(), str.length()), L"" );
 #endif

 	// Snap: Restore the data directory once we are finished.
@@ -2155,6 +2158,8 @@ void SummaryLoadMapCallback( GUI_BUTTON *btn, INT32 reason )
 		SetFontForeground( FONT_LTKHAKI );
 		SetFontShadow( FONT_NEARBLACK );

+		fNewMapSaved = TRUE;
+
 		//swprintf( str, L"Loading map:  %s...", gszDisplayName );
 		//mprintf( MAP_LEFT, MAP_BOTTOM+100, str );
 		//InvalidateRegion( MAP_LEFT, MAP_BOTTOM+100, MAP_LEFT+150,	MAP_BOTTOM+110 );
@@ -2640,11 +2645,11 @@ void GenerateSummaryList()
 		vfs::COpenWriteFile wfile(L"DevInfo/readme.txt",true,true);
 		std::string str = "This information is used in conjunction with the editor.\n";
 		str += "This directory or it's contents shouldn't be included with final release.\n";
-		TRYCATCH_RETHROW( wfile.file().write(str.c_str(), str.length()), L"");
+		SGP_TRYCATCH_RETHROW( wfile->write(str.c_str(), str.length()), L"");
 	}
-	catch(CBasicException &ex)
+	catch(std::exception &ex)
 	{
-		RETHROWEXCEPTION(L"Could not create readme.txt",&ex);
+		SGP_RETHROW(L"Could not create readme.txt", ex);
 	}
 #endif
 }
@@ -3220,6 +3225,9 @@ void SetupItemDetailsMode( BOOLEAN fAllowRecursion )
 	OBJECTTYPE *pItem;
 	UINT16 usPEnemyIndex, usNEnemyIndex;

+	SUMMARYFILE *s = gpCurrentSectorSummary;
+	MAPCREATE_STRUCT *m = &gpCurrentSectorSummary->MapInfo;
+
 	//Clear memory for all the item summaries loaded
 	if( gpWorldItemsSummaryArray )
 	{
@@ -3291,7 +3299,7 @@ void SetupItemDetailsMode( BOOLEAN fAllowRecursion )
 	gusWorldItemsSummaryArraySize = gpCurrentSectorSummary->usNumItems;
 	for (unsigned int x = 0; x < uiNumItems; ++x)
 	{
-		gpWorldItemsSummaryArray[x].Load(hfile);
+		gpWorldItemsSummaryArray[x].Load(hfile, s->dMajorMapVersion, m->ubMapVersion);
 	}

 	//NOW, do the enemy's items!
@@ -365,8 +365,9 @@ void PasteSingleWallCommon( INT32 iMapIndex )
 		// TEMP STUFF FOR ONROOF THINGS!
 		if ( (usUseObjIndex >= FIRSTONROOF) && (usUseObjIndex <= SECONDONROOF ) )
 		{
+			// WANNE: Disabled the next line, because if makes placing sandbags on rooftops impossible!
 			//dnl Remove all onroof things before placing new one to avoid stacking problems of same element
-			RemoveAllOnRoofsOfTypeRange( iMapIndex, FIRSTONROOF, SECONDONROOF );
+			//RemoveAllOnRoofsOfTypeRange( iMapIndex, FIRSTONROOF, SECONDONROOF );

 			// Add to onroof section!
 			AddOnRoofToTail( iMapIndex, (UINT16)(gTileTypeStartIndex[ usUseObjIndex ] + usUseIndex) );
@@ -214,6 +214,7 @@ BOOLEAN gfRealGunNut = TRUE;
 INT16 sGridX, sGridY;
 INT32 iMapIndex;
 BOOLEAN fNewMap = FALSE;
+BOOLEAN fNewMapSaved = TRUE;

 INT32 iPrevDrawMode = DRAW_MODE_NOTHING;
 UINT16 PrevCurrentPaste = FIRSTTEXTURE;
@@ -297,7 +298,8 @@ BOOLEAN EditModeInit( void )

 	//dnl after multiplayer stuff was implemeted, editor goes to assertion when you leave editor mode, because InitGameOption() is not called anymore from InitializeGame()
 	is_networked = FALSE;
-	InitGameOptions();
+	//InitGameOptions();
+	GameInitOptionsScreenInit();

 	ResetCustomFileSectorSummary();//dnl ch30 150909

@@ -375,6 +377,7 @@ BOOLEAN EditModeInit( void )

 	gfEditMode = TRUE;
 	fNewMap = FALSE;
+	fNewMapSaved = TRUE;

 	gfEditingDoor = FALSE;

@@ -2483,6 +2486,8 @@ void CreateNewMap()
 	ResetCustomFileSectorSummary();//dnl ch30 150909
 	SetRenderCenter(WORLD_COLS/2, WORLD_ROWS/2);//dnl ch43 280909
 	InitRenderParams(gMapInformation.ubRestrictedScrollID);//dnl ch54 101009
+
+	fNewMapSaved = FALSE;
 }


@@ -14,6 +14,9 @@ extern GUI_BUTTON *gpPersistantButton;

 extern UINT16 GenericButtonFillColors[40];

+// WANNE: 05.10.2010
+extern BOOLEAN fNewMapSaved;
+
 void DisplayWayPoints(void);

 BOOLEAN CheckForSlantRoofs( void );
@@ -185,36 +185,36 @@ void CreateJA2SelectionWindow( INT16 sWhat )
 	DisableEditorTaskbar( );

 	// Load up the button images
-	iButtonIcons[ CANCEL_ICON ] = LoadGenericButtonIcon( "EDITOR//bigX.sti" );
-	iButtonIcons[ UP_ICON ] = LoadGenericButtonIcon( "EDITOR//lgUpArrow.sti" );
-	iButtonIcons[ DOWN_ICON ] = LoadGenericButtonIcon( "EDITOR//lgDownArrow.sti" );
-	iButtonIcons[ OK_ICON ] = LoadGenericButtonIcon( "EDITOR//checkmark.sti" );
+	iButtonIcons[ SEL_WIN_CANCEL_ICON ] = LoadGenericButtonIcon( "EDITOR//bigX.sti" );
+	iButtonIcons[ SEL_WIN_UP_ICON ]		= LoadGenericButtonIcon( "EDITOR//lgUpArrow.sti" );
+	iButtonIcons[ SEL_WIN_DOWN_ICON ]	= LoadGenericButtonIcon( "EDITOR//lgDownArrow.sti" );
+	iButtonIcons[ SEL_WIN_OK_ICON ]		= LoadGenericButtonIcon( "EDITOR//checkmark.sti" );

 	iSelectWin = CreateHotSpot(0, 0, 600, 360, MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, SelWinClkCallback);

-	iCancelWin = CreateIconButton((INT16)iButtonIcons[CANCEL_ICON], 0,
+	iCancelWin = CreateIconButton((INT16)iButtonIcons[SEL_WIN_CANCEL_ICON], 0,
 														BUTTON_USE_DEFAULT, 600, 40,
 														40, 40, BUTTON_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, CnclClkCallback);
 	SetButtonFastHelpText(iCancelWin,L"Cancel selections");

-	iOkWin = CreateIconButton((INT16)iButtonIcons[OK_ICON], 0,
+	iOkWin = CreateIconButton((INT16)iButtonIcons[SEL_WIN_OK_ICON], 0,
 														BUTTON_USE_DEFAULT, 600, 0,
 														40, 40, BUTTON_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, OkClkCallback);
 	SetButtonFastHelpText(iOkWin,L"Accept selections");

-	iScrollUp = CreateIconButton((INT16)iButtonIcons[UP_ICON], 0,
+	iScrollUp = CreateIconButton((INT16)iButtonIcons[SEL_WIN_UP_ICON], 0,
 														BUTTON_USE_DEFAULT, 600, 80,
 														40, 160, BUTTON_NO_TOGGLE,
 														MSYS_PRIORITY_HIGH,
 														DEFAULT_MOVE_CALLBACK, UpClkCallback);
 	SetButtonFastHelpText(iScrollUp,L"Scroll window up");

-	iScrollDown = CreateIconButton((INT16)iButtonIcons[DOWN_ICON], 0,
+	iScrollDown = CreateIconButton((INT16)iButtonIcons[SEL_WIN_DOWN_ICON], 0,
 														BUTTON_USE_DEFAULT, 600, 240,
 														40, 160, BUTTON_NO_TOGGLE,
 														MSYS_PRIORITY_HIGH,
@@ -10,10 +10,10 @@
 #include "mousesystem.h"
 #include "Button System.h"

-#define CANCEL_ICON		0
-#define UP_ICON				1
-#define DOWN_ICON			2
-#define OK_ICON				3
+#define SEL_WIN_CANCEL_ICON			0
+#define SEL_WIN_UP_ICON				1
+#define SEL_WIN_DOWN_ICON			2
+#define SEL_WIN_OK_ICON				3

 extern INT32 iButtonIcons[4];
 extern INT32 iSelectWin,iCancelWin,iScrollUp,iScrollDown;