(svn r4746) - Fix: VC shows warning in newgrf_station.c:211 and complains about missing sprite.c

2006-05-05 19:30:09 +00:00
parent cf30c682a8
commit 607f88410e
3 changed files with 1274 additions and 1249 deletions
--- a/newgrf_station.c
+++ b/newgrf_station.c
@@ -208,7 +208,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by

 	switch (variable) {
 		/* Calculated station variables */
-		case 0x42: GetRailType(object->u.station.tile) << 8; /* Rail type */
+		case 0x42: return GetRailType(object->u.station.tile) << 8; /* Rail type */
 		case 0x43: return st->owner; /* Station owner */
 		case 0x44: return 2;         /* PBS status */
 		case 0x48: { /* Accepted cargo types */
--- a/openttd.dsp
+++ b/openttd.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 /MT /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" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c
+# ADD CPP /nologo /Gr /Zp4 /MT /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c
 # SUBTRACT CPP /WX /Ot
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
@@ -51,7 +51,7 @@ 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 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:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib /nologo /subsystem:windows /map /machine:I386 /opt:nowin98
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /libpath:"../lib" /opt:nowin98
 # SUBTRACT LINK32 /pdb:none

 !ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
@@ -68,7 +68,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 "_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_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /GZ /c
 # SUBTRACT CPP /WX /Fr
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
@@ -77,7 +77,7 @@ 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 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:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libc.lib" /pdbtype:sept /libpath:"../lib"
 # SUBTRACT LINK32 /pdb:none

 !ENDIF 
@@ -92,50 +92,15 @@ LINK32=link.exe
 # Begin Source File

 SOURCE=.\ai\ai.c
+
 !IF  "$(CFG)" == "openttd - Win32 Release"
+
 # ADD CPP /Yu"../stdafx.h"
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-!ENDIF
-# End Source File
-# Begin Source File

-SOURCE=.\ai\trolly\build.c
-!IF  "$(CFG)" == "openttd - Win32 Release"
-# ADD CPP /Yu"../../stdafx.h"
 !ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-!ENDIF
-# End Source File
-# Begin Source File

-SOURCE=.\ai\trolly\trolly.c
-!IF  "$(CFG)" == "openttd - Win32 Release"
-# ADD CPP /Yu"../../stdafx.h"
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
 !ENDIF 
-# End Source File
-# Begin Source File

-SOURCE=.\ai\default\default.c
-!IF  "$(CFG)" == "openttd - Win32 Release"
-# ADD CPP /Yu"../../stdafx.h"
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-!ENDIF
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\trolly\pathfinder.c
-!IF  "$(CFG)" == "openttd - Win32 Release"
-# ADD CPP /Yu"../../stdafx.h"
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-!ENDIF
-# End Source File
-# Begin Source File
-
-SOURCE=.\ai\trolly\shared.c
-!IF  "$(CFG)" == "openttd - Win32 Release"
-# ADD CPP /Yu"../../stdafx.h"
-!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
-!ENDIF
 # End Source File
 # Begin Source File

@@ -147,6 +112,19 @@ SOURCE=.\aystar.c
 # End Source File
 # Begin Source File

+SOURCE=.\ai\trolly\build.c
+
+!IF  "$(CFG)" == "openttd - Win32 Release"
+
+# ADD CPP /Yu"../../stdafx.h"
+
+!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\command.c
 # End Source File
 # Begin Source File
@@ -180,6 +158,19 @@ SOURCE=.\video\dedicated_v.c
 # End Source File
 # Begin Source File

+SOURCE=.\ai\default\default.c
+
+!IF  "$(CFG)" == "openttd - Win32 Release"
+
+# ADD CPP /Yu"../../stdafx.h"
+
+!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\depot.c
 # End Source File
 # Begin Source File
@@ -359,6 +350,19 @@ SOURCE=.\pathfind.c
 # End Source File
 # Begin Source File

+SOURCE=.\ai\trolly\pathfinder.c
+
+!IF  "$(CFG)" == "openttd - Win32 Release"
+
+# ADD CPP /Yu"../../stdafx.h"
+
+!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\players.c
 # End Source File
 # Begin Source File
@@ -417,6 +421,19 @@ SOURCE=.\settings.c
 # End Source File
 # Begin Source File

+SOURCE=.\ai\trolly\shared.c
+
+!IF  "$(CFG)" == "openttd - Win32 Release"
+
+# ADD CPP /Yu"../../stdafx.h"
+
+!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\signs.c
 # End Source File
 # Begin Source File
@@ -425,10 +442,6 @@ SOURCE=.\sound.c
 # End Source File
 # Begin Source File

-SOURCE=.\sprite.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\spritecache.c
 # End Source File
 # Begin Source File
@@ -466,6 +479,19 @@ SOURCE=.\tile.c
 # End Source File
 # Begin Source File

+SOURCE=.\ai\trolly\trolly.c
+
+!IF  "$(CFG)" == "openttd - Win32 Release"
+
+# ADD CPP /Yu"../../stdafx.h"
+
+!ELSEIF  "$(CFG)" == "openttd - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\unix.c
 # PROP Exclude_From_Build 1
 # End Source File
@@ -542,10 +568,6 @@ SOURCE=.\window.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File

-SOURCE=.\ai\trolly\trolly.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\ai\ai.h
 # End Source File
 # Begin Source File
@@ -766,6 +788,10 @@ SOURCE=.\train.h
 # End Source File
 # Begin Source File

+SOURCE=.\ai\trolly\trolly.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\variables.h
 # End Source File
 # Begin Source File
--- a/openttd.vcproj
+++ b/openttd.vcproj
@@ -58,6 +58,7 @@
 				OutputFile=".\Release/openttd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Release/openttd.pdb"
 				SubSystem="2"
@@ -124,6 +125,7 @@
 				OutputFile=".\Debug/openttd.exe"
 				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/openttd.pdb"
 				SubSystem="2"
@@ -349,9 +351,6 @@
 			<File
 				RelativePath=".\sound.c">
 			</File>
-			<File
-				RelativePath=".\sprite.c">
-			</File>
 			<File
 				RelativePath=".\spritecache.c">
 			</File>