Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

bugfix: create_mage u. Dämonen/VERGESSE

Browse source 
Windows: weg mit der Debug-CRT
This commit is contained in:
Enno Rehling 2006-02-05 10:47:28 +00:00
parent 3feb139071
commit 9466428c4d
14 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/attributes/attributes.vcproj
View file

@ -25,7 +25,7 @@
AdditionalIncludeDirectories="../kernel,../util,../..,.." AdditionalIncludeDirectories="../kernel,../util,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/common/gamecode/gamecode.vcproj
View file

@ -129,7 +129,7 @@
AdditionalIncludeDirectories="../kernel,../util,../..,.." AdditionalIncludeDirectories="../kernel,../util,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/common/gamecode/report.c
View file

@ -182,7 +182,7 @@ centre(FILE * F, const char *s, boolean breaking)
} }
static void 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 = " "; static const char * spaces = " ";
size_t length = REPORTWIDTH; size_t length = REPORTWIDTH;

2
src/common/items/items.vcproj
View file

@ -75,7 +75,7 @@
AdditionalIncludeDirectories="../kernel,../util,../..,.." AdditionalIncludeDirectories="../kernel,../util,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/common/kernel/kernel.vcproj
View file

@ -76,7 +76,7 @@
AdditionalIncludeDirectories="../util,../..,.." AdditionalIncludeDirectories="../util,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

6
src/common/kernel/magic.c
View file

@ -338,11 +338,9 @@ create_mage(unit * u, magic_t mtyp)
a = a_find(u->attribs, &at_mage); a = a_find(u->attribs, &at_mage);
if (a!=NULL) { if (a!=NULL) {
mage = a->data.v; a_remove(&u->attribs, a);
assert(mage->spells==NULL && mage->magietyp == mtyp);
} else {
a = a_add(&u->attribs, a_new(&at_mage));
} }
a = a_add(&u->attribs, a_new(&at_mage));
mage = a->data.v; mage = a->data.v;
mage->magietyp = mtyp; mage->magietyp = mtyp;

2
src/common/modules/modules.vcproj
View file

@ -24,7 +24,7 @@
AdditionalIncludeDirectories="../kernel,../util,../..,.." AdditionalIncludeDirectories="../kernel,../util,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/common/races/races.vcproj
View file

@ -24,7 +24,7 @@
AdditionalIncludeDirectories="../kernel,../util,../..,.." AdditionalIncludeDirectories="../kernel,../util,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/common/spells/spells.vcproj
View file

@ -75,7 +75,7 @@
AdditionalIncludeDirectories="../kernel,../util,../..,.." AdditionalIncludeDirectories="../kernel,../util,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/common/triggers/triggers.vcproj
View file

@ -24,7 +24,7 @@
AdditionalIncludeDirectories="../util,../kernel,../..,.." AdditionalIncludeDirectories="../util,../kernel,../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/common/util/util.vcproj
View file

@ -128,7 +128,7 @@
AdditionalIncludeDirectories="../..,.." AdditionalIncludeDirectories="../..,.."
PreprocessorDefinitions="_WINDOWS,WIN32" PreprocessorDefinitions="_WINDOWS,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

6
src/eressea/eressea-lua.vcproj
View file

@ -155,7 +155,7 @@
PreprocessorDefinitions="_CONSOLE,WIN32" PreprocessorDefinitions="_CONSOLE,WIN32"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="FALSE" DisableLanguageExtensions="FALSE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -175,11 +175,11 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386" AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="luabindd.lib lua50.lib libxml2.lib iconv.lib" AdditionalDependencies="luabind.lib lua50.lib libxml2.lib iconv.lib"
OutputFile=".\Debug/eressea-lua.exe" OutputFile=".\Debug/eressea-lua.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcmtd.lib, msvcrtd.lib" IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/eressea-lua.pdb" ProgramDatabaseFile=".\Debug/eressea-lua.pdb"
SubSystem="1"/> SubSystem="1"/>

2
src/eressea/eressea.vcproj
View file

@ -152,7 +152,7 @@
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.." AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="_CONSOLE,WIN32" PreprocessorDefinitions="_CONSOLE,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="FALSE" DisableLanguageExtensions="FALSE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"

2
src/mapper/mapper.vcproj
View file

@ -87,7 +87,7 @@
AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.." AdditionalIncludeDirectories="../common/kernel,../common/gamecode,../common/util,../common,.."
PreprocessorDefinitions="_CONSOLE,WIN32" PreprocessorDefinitions="_CONSOLE,WIN32"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="5" RuntimeLibrary="4"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
DisableLanguageExtensions="TRUE" DisableLanguageExtensions="TRUE"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"