From d076e53c4d82272ab084ccd072e5313c3bb2976c Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 14 Apr 2002 10:35:00 +0000 Subject: [PATCH] - Stiefel gewichtslos. - Typecast-Warnung - Browse-Info in Visual C Makefiles abgestellt (Visual Assist rulez) --- src/common/attributes/attributes.dsp | 3 ++- src/common/gamecode/gamecode.dsp | 3 ++- src/common/gamecode/randenc.c | 2 +- src/common/items/items.dsp | 3 ++- src/common/kernel/build.c | 4 ++-- src/common/kernel/item.c | 2 +- src/common/kernel/kernel.dsp | 3 ++- src/common/modules/modules.dsp | 3 ++- src/common/races/races.dsp | 3 ++- src/common/spells/spells.dsp | 3 ++- src/common/triggers/triggers.dsp | 3 ++- src/common/util/util.dsp | 3 ++- src/eressea/eressea.dsp | 3 ++- src/mapper/mapper.dsp | 3 ++- 14 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/common/attributes/attributes.dsp b/src/common/attributes/attributes.dsp index a2d756281..5709ab9a2 100644 --- a/src/common/attributes/attributes.dsp +++ b/src/common/attributes/attributes.dsp @@ -64,7 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/gamecode/gamecode.dsp b/src/common/gamecode/gamecode.dsp index 3a29be2b6..25a3c250a 100644 --- a/src/common/gamecode/gamecode.dsp +++ b/src/common/gamecode/gamecode.dsp @@ -65,7 +65,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/gamecode/randenc.c b/src/common/gamecode/randenc.c index bf1f5927d..4cf3cc556 100644 --- a/src/common/gamecode/randenc.c +++ b/src/common/gamecode/randenc.c @@ -1427,7 +1427,7 @@ randomevents(void) for (i=0;i < MAXSKILLS;i++) { if (rc->bonus[i] >= 1) { - set_level(u, i, 1); + set_level(u, (skill_t)i, 1); } } u->hp = unit_max_hp(u) * u->number; diff --git a/src/common/items/items.dsp b/src/common/items/items.dsp index 530983756..29c4f1e4b 100644 --- a/src/common/items/items.dsp +++ b/src/common/items/items.dsp @@ -64,7 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index 23ec9251f..7fd59da37 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -714,8 +714,8 @@ build(unit * u, const construction * ctype, int completed, int want) int maxbuild(const unit * u, const construction * cons) - /* calculate maximum size that can be built from available material */ - /* !! ignores maximum objectsize and improvements...*/ + /* calculate maximum size that can be built from available material */ + /* !! ignores maximum objectsize and improvements...*/ { int c; int maximum = INT_MAX; diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c index c401cba81..3f7582e9f 100644 --- a/src/common/kernel/item.c +++ b/src/common/kernel/item.c @@ -1132,7 +1132,7 @@ t_item itemdata[MAXITEMS] = { }, { /* I_FEENSTIEFEL 60 */ {"Feenstiefel", "Feenstiefel", "Feenstiefel", "Feenstiefel"}, G_M, - IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, 0, NULL + IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL }, { /* I_BIRTHDAYAMULET 69 */ {"Katzenamulett", "Katzenamulette", "Amulett", "Amulette"}, G_N, diff --git a/src/common/kernel/kernel.dsp b/src/common/kernel/kernel.dsp index d901f17a3..7e4b9aaac 100644 --- a/src/common/kernel/kernel.dsp +++ b/src/common/kernel/kernel.dsp @@ -65,7 +65,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/modules/modules.dsp b/src/common/modules/modules.dsp index 1b930a38f..74b071c5e 100644 --- a/src/common/modules/modules.dsp +++ b/src/common/modules/modules.dsp @@ -64,7 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/races/races.dsp b/src/common/races/races.dsp index c137fd239..4de7eb006 100644 --- a/src/common/races/races.dsp +++ b/src/common/races/races.dsp @@ -64,7 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/spells/spells.dsp b/src/common/spells/spells.dsp index d08fd3828..220a5df18 100644 --- a/src/common/spells/spells.dsp +++ b/src/common/spells/spells.dsp @@ -64,7 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../kernel" /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/triggers/triggers.dsp b/src/common/triggers/triggers.dsp index 054becc5e..092d3e647 100644 --- a/src/common/triggers/triggers.dsp +++ b/src/common/triggers/triggers.dsp @@ -64,7 +64,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../util" /I "../kernel" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/util/util.dsp b/src/common/util/util.dsp index b303cddae..2f019274f 100644 --- a/src/common/util/util.dsp +++ b/src/common/util/util.dsp @@ -65,7 +65,8 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /Od /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/eressea/eressea.dsp b/src/eressea/eressea.dsp index 8c2310f76..c7d37f906 100644 --- a/src/eressea/eressea.dsp +++ b/src/eressea/eressea.dsp @@ -67,7 +67,8 @@ 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" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Gm /ZI /Od /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Gm /ZI /Od /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe diff --git a/src/mapper/mapper.dsp b/src/mapper/mapper.dsp index d27ed8ccf..ccf07e9e1 100644 --- a/src/mapper/mapper.dsp +++ b/src/mapper/mapper.dsp @@ -66,7 +66,8 @@ 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" /YX /FD /c -# ADD CPP /nologo /Za /W4 /Gm /ZI /Od /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FR /YX"stdafx.h" /FD /c +# ADD CPP /nologo /Za /W4 /Gm /ZI /Od /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /YX"stdafx.h" /FD /c +# SUBTRACT CPP /Fr # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe