(svn r1513) -Fix: glitch in revision 1510

-Fix: MSVC6 project file update (bociusz)
-Fix: MSVC6 default language is now English (UK), no longer Swedish (bociusz)

2 files changed, 13 insertions, 9 deletions

diff --git a/network_client.c b/network_client.c
index 613cf8549..cf64e1485 100644
--- a/network_client.c
+++ b/network_client.c
@@ -279,7 +279,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMPANY_INFO)
 
 	company_info_version = NetworkRecv_uint8(MY_CLIENT, p);
 
-	if (!MY_CLIENT->quited && company_info_version == 1) {
+	if (!MY_CLIENT->quited && company_info_version == NETWORK_COMPANY_INFO_VERSION) {
 		byte total;
 		byte current;
 
diff --git a/ttd.dsp b/ttd.dsp
index 02681a03f..3cce5faae 100644
--- a/ttd.dsp
+++ b/ttd.dsp
@@ -46,8 +46,8 @@ RSC=rc.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c

 # ADD CPP /nologo /Gr /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /FAcs /FR /Yu"stdafx.h" /J /FD /c

 # SUBTRACT CPP /WX /Ot

-# ADD BASE RSC /l 0x41d /d "NDEBUG"

-# ADD RSC /l 0x41d /d "NDEBUG"

+# ADD BASE RSC /l 0x809 /d "NDEBUG"

+# ADD RSC /l 0x809 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -72,8 +72,8 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c

 # ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /YX"stdafx.h" /FD /GZ /c

 # SUBTRACT CPP /WX /Fr

-# ADD BASE RSC /l 0x41d /d "_DEBUG"

-# ADD RSC /l 0x41d /d "_DEBUG"

+# ADD BASE RSC /l 0x809 /d "_DEBUG"

+# ADD RSC /l 0x809 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -99,8 +99,8 @@ LINK32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /GZ /c

 # SUBTRACT BASE CPP /WX /Fr

 # ADD CPP /nologo /Gr /Zp4 /ML /W3 /Gm /Zi /Ox /Oa /Ow /Og /Oi /Os /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /c

-# ADD BASE RSC /l 0x41d /d "_DEBUG"

-# ADD RSC /l 0x41d /d "_DEBUG"

+# ADD BASE RSC /l 0x809 /d "_DEBUG"

+# ADD RSC /l 0x809 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -128,8 +128,8 @@ LINK32=link.exe
 # SUBTRACT BASE CPP /WX /Ot

 # ADD CPP /nologo /Gr /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /FAcs /FR /Yu"stdafx.h" /J /FD /c

 # SUBTRACT CPP /WX /Ot

-# ADD BASE RSC /l 0x41d /d "NDEBUG"

-# ADD RSC /l 0x41d /d "NDEBUG"

+# ADD BASE RSC /l 0x809 /d "NDEBUG"

+# ADD RSC /l 0x809 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -813,6 +813,10 @@ SOURCE=.\table\roadveh.h
 # End Source File

 

 # Begin Source File

+SOURCE=.\table\sprites.h

+# End Source File

+

+# Begin Source File

 SOURCE=.\table\station_land.h

 # End Source File