From 9466428c4d7f8af5e21a11ca2fd50cb4631b72c0 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 5 Feb 2006 10:47:28 +0000 Subject: [PATCH] =?UTF-8?q?bugfix:=20create=5Fmage=20u.=20D=C3=A4monen/VER?= =?UTF-8?q?GESSE=20Windows:=20weg=20mit=20der=20Debug-CRT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/attributes/attributes.vcproj | 2 +- src/common/gamecode/gamecode.vcproj | 2 +- src/common/gamecode/report.c | 2 +- src/common/items/items.vcproj | 2 +- src/common/kernel/kernel.vcproj | 2 +- src/common/kernel/magic.c | 6 ++---- src/common/modules/modules.vcproj | 2 +- src/common/races/races.vcproj | 2 +- src/common/spells/spells.vcproj | 2 +- src/common/triggers/triggers.vcproj | 2 +- src/common/util/util.vcproj | 2 +- src/eressea/eressea-lua.vcproj | 6 +++--- src/eressea/eressea.vcproj | 2 +- src/mapper/mapper.vcproj | 2 +- 14 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/common/attributes/attributes.vcproj b/src/common/attributes/attributes.vcproj index 050b4fc05..7efdd3471 100644 --- a/src/common/attributes/attributes.vcproj +++ b/src/common/attributes/attributes.vcproj @@ -25,7 +25,7 @@ AdditionalIncludeDirectories="../kernel,../util,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/gamecode/gamecode.vcproj b/src/common/gamecode/gamecode.vcproj index eaee06922..e27db1cfd 100644 --- a/src/common/gamecode/gamecode.vcproj +++ b/src/common/gamecode/gamecode.vcproj @@ -129,7 +129,7 @@ AdditionalIncludeDirectories="../kernel,../util,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 1b9ac9d5a..b094cc22a 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -182,7 +182,7 @@ centre(FILE * F, const char *s, boolean breaking) } static void -rparagraph(FILE *F, const char *str, int indent, int hanging_indent, char mark) +rparagraph(FILE *F, const char *str, ptrdiff_t indent, int hanging_indent, char mark) { static const char * spaces = " "; size_t length = REPORTWIDTH; diff --git a/src/common/items/items.vcproj b/src/common/items/items.vcproj index 5ea120931..2c7abbcba 100644 --- a/src/common/items/items.vcproj +++ b/src/common/items/items.vcproj @@ -75,7 +75,7 @@ AdditionalIncludeDirectories="../kernel,../util,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/kernel/kernel.vcproj b/src/common/kernel/kernel.vcproj index 1ec7e310d..7695a8688 100644 --- a/src/common/kernel/kernel.vcproj +++ b/src/common/kernel/kernel.vcproj @@ -76,7 +76,7 @@ AdditionalIncludeDirectories="../util,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/kernel/magic.c b/src/common/kernel/magic.c index 64011c4f4..beac5426f 100644 --- a/src/common/kernel/magic.c +++ b/src/common/kernel/magic.c @@ -338,11 +338,9 @@ create_mage(unit * u, magic_t mtyp) a = a_find(u->attribs, &at_mage); if (a!=NULL) { - mage = a->data.v; - assert(mage->spells==NULL && mage->magietyp == mtyp); - } else { - a = a_add(&u->attribs, a_new(&at_mage)); + a_remove(&u->attribs, a); } + a = a_add(&u->attribs, a_new(&at_mage)); mage = a->data.v; mage->magietyp = mtyp; diff --git a/src/common/modules/modules.vcproj b/src/common/modules/modules.vcproj index 8ddbe19b7..2c63b61b9 100644 --- a/src/common/modules/modules.vcproj +++ b/src/common/modules/modules.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="../kernel,../util,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/races/races.vcproj b/src/common/races/races.vcproj index 84d2dd91d..b9c1046d3 100644 --- a/src/common/races/races.vcproj +++ b/src/common/races/races.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="../kernel,../util,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/spells/spells.vcproj b/src/common/spells/spells.vcproj index e3296325d..8f6af22ba 100644 --- a/src/common/spells/spells.vcproj +++ b/src/common/spells/spells.vcproj @@ -75,7 +75,7 @@ AdditionalIncludeDirectories="../kernel,../util,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/triggers/triggers.vcproj b/src/common/triggers/triggers.vcproj index 14ba3ee43..83ec07158 100644 --- a/src/common/triggers/triggers.vcproj +++ b/src/common/triggers/triggers.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="../util,../kernel,../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/common/util/util.vcproj b/src/common/util/util.vcproj index 70d4dde02..4a0f14335 100644 --- a/src/common/util/util.vcproj +++ b/src/common/util/util.vcproj @@ -128,7 +128,7 @@ AdditionalIncludeDirectories="../..,.." PreprocessorDefinitions="_WINDOWS,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0" diff --git a/src/eressea/eressea-lua.vcproj b/src/eressea/eressea-lua.vcproj index b4cfe8f76..337b361cc 100644 --- a/src/eressea/eressea-lua.vcproj +++ b/src/eressea/eressea-lua.vcproj @@ -155,7 +155,7 @@ PreprocessorDefinitions="_CONSOLE,WIN32" StringPooling="TRUE" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="FALSE" UsePrecompiledHeader="0" @@ -175,11 +175,11 @@ diff --git a/src/eressea/eressea.vcproj b/src/eressea/eressea.vcproj index 4665c16c0..c29e9f078 100644 --- a/src/eressea/eressea.vcproj +++ b/src/eressea/eressea.vcproj @@ -152,7 +152,7 @@ AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.." PreprocessorDefinitions="_CONSOLE,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="FALSE" UsePrecompiledHeader="0" diff --git a/src/mapper/mapper.vcproj b/src/mapper/mapper.vcproj index 08bc7b03f..5f7343f44 100644 --- a/src/mapper/mapper.vcproj +++ b/src/mapper/mapper.vcproj @@ -87,7 +87,7 @@ AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.." PreprocessorDefinitions="_CONSOLE,WIN32" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="4" BufferSecurityCheck="TRUE" DisableLanguageExtensions="TRUE" UsePrecompiledHeader="0"