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

Bugfix Undead 

VC6 Settings for Release Mode
This commit is contained in:
Enno Rehling 2003-06-15 00:01:21 +00:00
parent 749bda2887
commit bfc096d825
10 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/gamecode/economy.c
View File

@ -892,7 +892,7 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
} }
/* if ((u->race->ec_flags & NOGIVE) || fval(u,FL_LOCKED)) {*/ /* if ((u->race->ec_flags & NOGIVE) || fval(u,FL_LOCKED)) {*/
if (u->race->ec_flags & NOGIVE) { if (u->race->ec_flags & NOGIVE && u2!=NULL) {
add_message(&u->faction->msgs, add_message(&u->faction->msgs,
msg_error(u, S->s, "race_nogive", "race", u->race)); msg_error(u, S->s, "race_nogive", "race", u->race));
return; return;
@ -1056,15 +1056,17 @@ dogive(region * r, unit * u, strlist * S, boolean liefere, int mode)
return; return;
} }
if (u2!=NULL) {
if (!(u->race->ec_flags & GIVEITEM)) { if (!(u->race->ec_flags & GIVEITEM)) {
add_message(&u->faction->msgs, add_message(&u->faction->msgs,
msg_error(u, S->s, "race_nogive", "race", u->race)); msg_error(u, S->s, "race_nogive", "race", u->race));
return; return;
} }
if (u2 && !(u2->race->ec_flags & GETITEM)) { if (!(u2->race->ec_flags & GETITEM)) {
ADDMSG(&u->faction->msgs, ADDMSG(&u->faction->msgs,
msg_error(u, S->s, "race_notake", "race", u2->race)); msg_error(u, S->s, "race_notake", "race", u2->race));
return; return;
}
} }
itype = finditemtype(s, u->faction->locale); itype = finditemtype(s, u->faction->locale);

2
src/common/gamecode/randenc.c
View File

@ -1135,7 +1135,7 @@ randomevents(void)
} }
#endif #endif
/* Talente von Dämonen verschieben sich */ /* Talentverschiebung: Talente von Dämonen verschieben sich */
for (r = regions; r; r = r->next) { for (r = regions; r; r = r->next) {
for (u = r->units; u; u = u->next) { for (u = r->units; u; u = u->next) {

2
src/common/items/items.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407 # ADD BASE RSC /l 0x407
# ADD RSC /l 0x407 # ADD RSC /l 0x407
BSC32=bscmake.exe BSC32=bscmake.exe

2
src/common/modules/modules.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407 # ADD BASE RSC /l 0x407
# ADD RSC /l 0x407 # ADD RSC /l 0x407
BSC32=bscmake.exe BSC32=bscmake.exe

2
src/common/races/races.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407 # ADD BASE RSC /l 0x407
# ADD RSC /l 0x407 # ADD RSC /l 0x407
BSC32=bscmake.exe BSC32=bscmake.exe

2
src/common/spells/spells.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407 # ADD BASE RSC /l 0x407
# ADD RSC /l 0x407 # ADD RSC /l 0x407
BSC32=bscmake.exe BSC32=bscmake.exe

2
src/common/triggers/triggers.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407 # ADD BASE RSC /l 0x407
# ADD RSC /l 0x407 # ADD RSC /l 0x407
BSC32=bscmake.exe BSC32=bscmake.exe

12
src/eressea.dsw
View File

@ -150,18 +150,6 @@ Package=<4>
############################################################################### ###############################################################################
Project: "skilltest"=.\skilltest\skilltest.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "spells"=.\common\spells\spells.dsp - Package Owner=<4> Project: "spells"=.\common\spells\spells.dsp - Package Owner=<4>
Package=<5> Package=<5>

13
src/eressea/eressea.dsp
View File

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /Za /W4 /GX /Zi /O2 /I "../common/kernel" /I "../common/gamecode" /I "../common/util" /I "../common" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -136,6 +136,17 @@ SOURCE=.\korrektur.h
# Begin Source File # Begin Source File
SOURCE=.\main.c SOURCE=.\main.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# ADD CPP /D MALLOCDBG=3
!ELSEIF "$(CFG)" == "eressea - Win32 Profile"
!ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File

4
src/eressea/main.c
View File

@ -381,7 +381,7 @@ game_done(void)
#include "magic.h" #include "magic.h"
#if MALLOCDBG #ifdef MALLOCDBG
void void
init_malloc_debug(void) init_malloc_debug(void)
{ {
@ -638,7 +638,7 @@ main(int argc, char *argv[])
return -1; return -1;
} }
#endif #endif
#if 0 #ifdef MALLOCDBG
init_malloc_debug(); init_malloc_debug();
#endif #endif