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

bugfix neue Zauber, LMS-Belohnungs-item, items-libraryfile, untote entstehen nicht aus den regulaeren toten, untotengraeber werden reduziert, const-modifier von namensfunktionen angepasst

This commit is contained in:
Enno Rehling 2001-02-02 08:40:49 +00:00
parent d44226d452
commit 0600da453b
42 changed files with 3637 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

299
src/askalon/askalon-6.dsp Normal file
View File

@ -0,0 +1,299 @@
# Microsoft Developer Studio Project File - Name="askalon" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=askalon - Win32 Conversion
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "askalon-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "askalon-6.mak" CFG="askalon - Win32 Conversion"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "askalon - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "askalon - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "askalon - Win32 Conversion" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "askalon - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "askalon_"
# PROP BASE Intermediate_Dir "askalon_"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "askalon - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "askalon0"
# PROP BASE Intermediate_Dir "askalon0"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# 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 ".." /I "../util" /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ELSEIF "$(CFG)" == "askalon - Win32 Conversion"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "askalon_"
# PROP BASE Intermediate_Dir "askalon_"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "askalon_"
# PROP Intermediate_Dir "askalon_"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /Za /W4 /Gm /Zi /Od /I ".." /I "../util" /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MDd /Za /W4 /Gm /ZI /Od /I ".." /I "../util" /I "../common" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "CONVERT_TRIGGER" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "askalon - Win32 Release"
# Name "askalon - Win32 Debug"
# Name "askalon - Win32 Conversion"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=..\modules\arena.h
# End Source File
# Begin Source File
SOURCE=..\modules\museum.h
# End Source File
# Begin Source File
SOURCE=..\modules\score.h
# End Source File
# Begin Source File
SOURCE=.\weapons.h
# End Source File
# Begin Source File
SOURCE=..\modules\xmas2000.h
# End Source File
# End Group
# Begin Group "Conversion"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\old\pointertags.c
!IF "$(CFG)" == "askalon - Win32 Release"
!ELSEIF "$(CFG)" == "askalon - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "askalon - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\old\relation.c
!IF "$(CFG)" == "askalon - Win32 Release"
!ELSEIF "$(CFG)" == "askalon - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "askalon - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\old\trigger.c
!IF "$(CFG)" == "askalon - Win32 Release"
!ELSEIF "$(CFG)" == "askalon - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "askalon - Win32 Conversion"
!ENDIF
# End Source File
# End Group
# Begin Group "Attributes"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\attributes\attributes.c
# End Source File
# Begin Source File
SOURCE=..\attributes\attributes.h
# End Source File
# Begin Source File
SOURCE=..\attributes\follow.c
# End Source File
# Begin Source File
SOURCE=..\attributes\follow.h
# End Source File
# Begin Source File
SOURCE=..\attributes\hate.c
# End Source File
# Begin Source File
SOURCE=..\attributes\iceberg.c
# End Source File
# Begin Source File
SOURCE=..\attributes\iceberg.h
# End Source File
# Begin Source File
SOURCE=..\attributes\key.c
# End Source File
# Begin Source File
SOURCE=..\attributes\key.h
# End Source File
# Begin Source File
SOURCE=..\attributes\matmod.c
# End Source File
# Begin Source File
SOURCE=..\attributes\matmod.h
# End Source File
# Begin Source File
SOURCE=..\attributes\reduceproduction.c
# End Source File
# Begin Source File
SOURCE=..\attributes\reduceproduction.h
# End Source File
# Begin Source File
SOURCE=..\attributes\targetregion.c
# End Source File
# End Group
# Begin Group "Races"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\races\dragons.c
# End Source File
# Begin Source File
SOURCE=..\races\dragons.h
# End Source File
# Begin Source File
SOURCE=..\races\illusion.c
# End Source File
# Begin Source File
SOURCE=..\races\illusion.h
# End Source File
# Begin Source File
SOURCE=..\races\zombies.c
# End Source File
# Begin Source File
SOURCE=..\races\zombies.h
# End Source File
# End Group
# Begin Group "Items"
# PROP Default_Filter ""
# End Group
# Begin Source File
SOURCE=.\korrektur.c
# End Source File
# Begin Source File
SOURCE=.\main.c
# End Source File
# Begin Source File
SOURCE=..\modules\score.c
# End Source File
# Begin Source File
SOURCE=.\triggers.c
# End Source File
# Begin Source File
SOURCE=.\weapons.c
# End Source File
# End Target
# End Project

164
src/common/attributes/attributes-6.dsp Normal file
View File

@ -0,0 +1,164 @@
# Microsoft Developer Studio Project File - Name="attributes" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=attributes - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "attributes-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "attributes-6.mak" CFG="attributes - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "attributes - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "attributes - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "attributes - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "attributes - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "attributes - Win32 Release"
# Name "attributes - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\attributes.h
# End Source File
# Begin Source File
SOURCE=.\follow.h
# End Source File
# Begin Source File
SOURCE=.\giveitem.h
# End Source File
# Begin Source File
SOURCE=.\hate.h
# End Source File
# Begin Source File
SOURCE=.\iceberg.h
# End Source File
# Begin Source File
SOURCE=.\key.h
# End Source File
# Begin Source File
SOURCE=.\matmod.h
# End Source File
# Begin Source File
SOURCE=.\reduceproduction.h
# End Source File
# Begin Source File
SOURCE=.\targetregion.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\attributes.c
# End Source File
# Begin Source File
SOURCE=.\follow.c
# End Source File
# Begin Source File
SOURCE=.\giveitem.c
# End Source File
# Begin Source File
SOURCE=.\hate.c
# End Source File
# Begin Source File
SOURCE=.\iceberg.c
# End Source File
# Begin Source File
SOURCE=.\key.c
# End Source File
# Begin Source File
SOURCE=.\matmod.c
# End Source File
# Begin Source File
SOURCE=.\orcification.c
# End Source File
# Begin Source File
SOURCE=.\reduceproduction.c
# End Source File
# Begin Source File
SOURCE=.\targetregion.c
# End Source File
# End Target
# End Project

13
src/common/attributes/attributes.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: attributes.c,v 1.3 2001/01/27 19:30:07 enno Exp $
* $Id: attributes.c,v 1.4 2001/02/02 08:40:44 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -19,6 +19,7 @@
/* attributes includes */
#include "key.h"
#include "targetregion.h"
#include "orcification.h"
#include "reduceproduction.h"
#include "follow.h"
#include "iceberg.h"
@ -27,14 +28,6 @@
/* util includes */
#include <attrib.h>
/*
* simple attributes that do not yet have their own file
*/
attrib_type at_orcification = {
"orcification", NULL, NULL, NULL, a_writedefault, a_readdefault, ATF_UNIQUE
};
/*
* library initialization
*/
@ -53,6 +46,8 @@ init_attributes(void)
init_follow();
/* at_targetregion */
init_targetregion();
/* at_orcification */
init_orcification();
/* at_hate */
init_hate();
/* at_reduceproduction */

40
src/common/attributes/orcification.c Normal file
View File

@ -0,0 +1,40 @@
/* vi: set ts=2:
*
* $Id: orcification.c,v 1.1 2001/02/02 08:40:44 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
* Henning Peters (faroul@beyond.kn-bremen.de)
* Enno Rehling (enno@eressea-pbem.de)
* Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
*
* This program may not be used, modified or distributed without
* prior permission by the authors of Eressea.
*/
#include <config.h>
#include "orcification.h"
#include <attrib.h>
/*
* simple attributes that do not yet have their own file
*/
attrib_type at_orcification = {
"orcification", NULL, NULL, NULL, a_writedefault, a_readdefault, ATF_UNIQUE
};
attrib *
make_orcification(int orcification)
{
attrib * a = a_new(&at_orcification);
a->data.i = orcification;
return a;
}
void
init_orcification(void)
{
at_register(&at_orcification);
}

18
src/common/attributes/orcification.h Normal file
View File

@ -0,0 +1,18 @@
/* vi: set ts=2:
*
* $Id: orcification.h,v 1.1 2001/02/02 08:40:44 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
* Henning Peters (faroul@beyond.kn-bremen.de)
* Enno Rehling (enno@eressea-pbem.de)
* Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
*
* This program may not be used, modified or distributed without
* prior permission by the authors of Eressea.
*/
extern struct attrib_type at_orcification;
extern struct attrib * make_orcification(int orcification);
extern void init_orcification(void);

307
src/common/gamecode/gamecode-6.dsp Normal file
View File

@ -0,0 +1,307 @@
# Microsoft Developer Studio Project File - Name="gamecode" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=gamecode - Win32 Conversion
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "gamecode-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "gamecode-6.mak" CFG="gamecode - Win32 Conversion"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "gamecode - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gamecode - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "gamecode - Win32 Conversion" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "gamecode - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "gamecode - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Debug\gamecode.lib"
!ELSEIF "$(CFG)" == "gamecode - Win32 Conversion"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "gamecode__"
# PROP BASE Intermediate_Dir "gamecode__"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "gamecode__"
# PROP Intermediate_Dir "gamecode__"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /Za /W4 /Z7 /Od /I ".." /I "../util" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MDd /Za /W4 /Z7 /Od /I ".." /I "../util" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D "CONVERT_TRIGGER" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "gamecode - Win32 Release"
# Name "gamecode - Win32 Debug"
# Name "gamecode - Win32 Conversion"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\alchemy.h
# End Source File
# Begin Source File
SOURCE=.\battle.h
# End Source File
# Begin Source File
SOURCE=.\border.h
# End Source File
# Begin Source File
SOURCE=.\build.h
# End Source File
# Begin Source File
SOURCE=.\building.h
# End Source File
# Begin Source File
SOURCE=.\creation.h
# End Source File
# Begin Source File
SOURCE=.\economy.h
# End Source File
# Begin Source File
SOURCE=.\eressea.h
# End Source File
# Begin Source File
SOURCE=.\group.h
# End Source File
# Begin Source File
SOURCE=.\item.h
# End Source File
# Begin Source File
SOURCE=.\karma.h
# End Source File
# Begin Source File
SOURCE=.\laws.h
# End Source File
# Begin Source File
SOURCE=.\magic.h
# End Source File
# Begin Source File
SOURCE=.\message.h
# End Source File
# Begin Source File
SOURCE=.\monster.h
# End Source File
# Begin Source File
SOURCE=.\movement.h
# End Source File
# Begin Source File
SOURCE=.\names.h
# End Source File
# Begin Source File
SOURCE=.\objtypes.h
# End Source File
# Begin Source File
SOURCE=.\orders.h
# End Source File
# Begin Source File
SOURCE=.\pathfinder.h
# End Source File
# Begin Source File
SOURCE=.\plane.h
# End Source File
# Begin Source File
SOURCE=.\pool.h
# End Source File
# Begin Source File
SOURCE=.\race.h
# End Source File
# Begin Source File
SOURCE=.\randenc.h
# End Source File
# Begin Source File
SOURCE=.\region.h
# End Source File
# Begin Source File
SOURCE=.\render.h
# End Source File
# Begin Source File
SOURCE=.\reports.h
# End Source File
# Begin Source File
SOURCE=.\save.h
# End Source File
# Begin Source File
SOURCE=.\ship.h
# End Source File
# Begin Source File
SOURCE=.\skill.h
# End Source File
# Begin Source File
SOURCE=.\spell.h
# End Source File
# Begin Source File
SOURCE=.\spells.h
# End Source File
# Begin Source File
SOURCE=.\spy.h
# End Source File
# Begin Source File
SOURCE=.\study.h
# End Source File
# Begin Source File
SOURCE=.\teleport.h
# End Source File
# Begin Source File
SOURCE=.\terrain.h
# End Source File
# Begin Source File
SOURCE=.\unit.h
# End Source File
# End Group
# Begin Group "Spells"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\spells\alp.c
# End Source File
# End Group
# Begin Source File
SOURCE=.\creation.c
# End Source File
# Begin Source File
SOURCE=.\creport.c
# End Source File
# Begin Source File
SOURCE=.\economy.c
# End Source File
# Begin Source File
SOURCE=.\laws.c
# End Source File
# Begin Source File
SOURCE=.\monster.c
# End Source File
# Begin Source File
SOURCE=.\randenc.c
# End Source File
# Begin Source File
SOURCE=.\report.c
# End Source File
# Begin Source File
SOURCE=.\spy.c
# End Source File
# Begin Source File
SOURCE=.\study.c
# End Source File
# End Target
# End Project

8
src/common/gamecode/laws.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: laws.c,v 1.5 2001/01/30 20:02:05 enno Exp $
* $Id: laws.c,v 1.6 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -437,12 +437,6 @@ peasants(region * r)
peasants = rpeasants(r);
for (n = peasants; n; n--) {
if (rand() % 100 < PEASANTDIE) {
peasants--;
}
}
for (n = peasants; n; n--) {
if (glueck >= 0) { /* Sonst keine Vermehrung */
if (rand() % 100 < PEASANTGROWTH) {

9
src/common/gamecode/monster.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: monster.c,v 1.3 2001/01/28 08:50:45 enno Exp $
* $Id: monster.c,v 1.4 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -570,15 +570,12 @@ eaten_by_monster(unit * u)
n = rand()%(u->number/20+1);
}
if(n > 0) {
attrib * a = a_find(u->region->attribs, &at_deathcount);
if (!a) a = a_add(&u->region->attribs, a_new(&at_deathcount));
if (n > 0) {
n = lovar(n);
n = min(rpeasants(u->region), n);
if(n > 0) {
a->data.i += n;
deathcounts(u->region, n);
rsetpeasants(u->region, rpeasants(u->region) - n);
add_message(&u->region->msgs, new_message(NULL,
"eatpeasants%u:unit%i:amount", u, n));

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

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: randenc.c,v 1.4 2001/01/31 17:40:49 corwin Exp $
* $Id: randenc.c,v 1.5 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -1063,9 +1063,6 @@ randomevents(void)
}
dc = max(u->number - bauernblut, 0);
dc = min(dc, rpeasants(r));
#if DAEMON_DEATHCOUNT
deathcounts(r, dc);
#endif
dc = rpeasants(r) - max(u->number - bauernblut, 0);
dc = max(0, dc);
rsetpeasants(r, dc);
@ -1303,21 +1300,17 @@ randomevents(void)
/* Untote können entstehen */
for (r = regions; r; r = r->next) {
double average;
int unburied = deathcount(r);
if(is_cursed(r->attribs, C_HOLYGROUND, 0)) continue;
average = (rpeasants(r)/(PEASANTGROWTH*0.01)/LIFEEXPECTANCY);
/* Chance 0.1% * chaosfactor */
/* nur, wenn Gräber 50% über normal liegen */
if (rand() % 10000 < (100 + 100 * chaosfactor(r))
&& deathcount(r) > average * 1.5 && r->land) {
int undead = deathcount(r) / (rand() % 2 + 1);
if (unburied && r->land && rand() % 10000 < (100 + 100 * chaosfactor(r))) {
int undead = unburied / (rand() % 2 + 1);
race_t rc;
int i;
if (r->age < 20 || !undead) continue;
if (!undead || r->age < 20) continue;
switch(rand()%3) {
case 0:
@ -1362,12 +1355,11 @@ randomevents(void)
"undeadrise%r:region", r));
}
} else {
int dead = rpeasants(r) / LIFEEXPECTANCY;
int peasants = rpeasants(r);
/* Gräber verwittern. Bauern in der Region sterben. */
if (rand() % LIFEEXPECTANCY < peasants % LIFEEXPECTANCY) ++dead;
deathcounts(r, dead-(int)(deathcount(r)*0.01));
if (dead) rsetpeasants(r, peasants - dead);
int i = deathcount(r);
if (i) {
/* Gräber verwittern, 3% der Untoten finden die ewige Ruhe */
deathcounts(r, (int)(1+i*0.03));
}
}
}

8
src/common/items/demonseye.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: demonseye.c,v 1.2 2001/01/26 16:19:39 enno Exp $
* $Id: demonseye.c,v 1.3 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -57,3 +57,9 @@ item_type it_demonseye = {
&summon_igjarjuk,
&give_igjarjuk
};
void
init_demonseye(void)
{
it_register(&it_demonseye);
}

3
src/common/items/demonseye.h
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: demonseye.h,v 1.2 2001/01/26 16:19:39 enno Exp $
* $Id: demonseye.h,v 1.3 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -13,3 +13,4 @@
*/
extern struct item_type it_demonseye;
extern void init_demonseye(void);

116
src/common/items/items-6.dsp Normal file
View File

@ -0,0 +1,116 @@
# Microsoft Developer Studio Project File - Name="items" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=items - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "items-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "items-6.mak" CFG="items - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "items - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "items - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "items - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "items - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "items - Win32 Release"
# Name "items - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\demonseye.h
# End Source File
# Begin Source File
SOURCE=.\items.h
# End Source File
# Begin Source File
SOURCE=.\weapons.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\demonseye.c
# End Source File
# Begin Source File
SOURCE=.\items.c
# End Source File
# Begin Source File
SOURCE=.\lmsreward.c
# End Source File
# Begin Source File
SOURCE=.\weapons.c
# End Source File
# End Target
# End Project

10
src/common/items/items.c Normal file
View File

@ -0,0 +1,10 @@
#include <items/lmsreward.h>
#include <items/demonseye.h>
void
init_items(void)
{
init_weapons();
init_demonseye();
init_lmsreward();
}

1
src/common/items/items.h Normal file
View File

@ -0,0 +1 @@
extern void init_items(void);

97
src/common/items/lmsreward.c Normal file
View File

@ -0,0 +1,97 @@
/* vi: set ts=2:
*
* $Id: lmsreward.c,v 1.1 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
* Henning Peters (faroul@beyond.kn-bremen.de)
* Enno Rehling (enno@eressea-pbem.de)
* Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
*
* This program may not be used, modified or distributed without
* prior permission by the authors of Eressea.
*/
#include <config.h>
#include <eressea.h>
#include "lmsreward.h"
/* kernel includes */
#include <item.h>
#include <region.h>
#include <unit.h>
#include <curse.h>
/* libc includes */
#include <assert.h>
#include <string.h>
static int
info_lmsstory(const void* vp, int i, curse * c, int i2)
{
unused(vp);
unused(i);
unused(c);
unused(i2);
strcpy(buf, "Die Bauern der Region erzählen sich die Geschichte von den glorreichen Siegern des Last-Man-Standing Turniers.");
return 1;
}
static curse_type ct_lmsstory = {
0, 0, 0, NULL, NULL, &info_lmsstory
};
static int
age_lmsstory(attrib * a)
{
return --a->data.i;
}
static attrib_type at_lmsstory = {
"lms_story",
NULL, NULL,
age_lmsstory,
a_writedefault,
a_readdefault,
ATF_UNIQUE | ATF_CURSE
};
static int
use_lmsreward(struct unit * u, const struct item_type * itype, const char * cmd)
{
region * r = u->region;
attrib * a = a_find(r->attribs, &at_lmsstory);
if (!a) a = a_add(&r->attribs, a_new(&at_lmsstory));
a->data.i = 4 + (rand() % 8);
sprintf(buf, "%s erzählt in allen Schenken die Geschichte vom glorreichen Sieg im Last-Man-Standing Turnier. Noch wochenlang werden die Bauern in %s sich diese Geschichte erzählen.", unitname(u), regionid(r));
addmessage(r, NULL, buf, MSG_MESSAGE, ML_IMPORTANT);
unused(itype);
unused(cmd);
return -1;
}
static resource_type rt_lmsreward = {
{ "lmsreward", "lmsrewards" },
{ "lmsreward", "lmsrewards" },
RTF_ITEM,
&res_changeitem
};
item_type it_lmsreward = {
&rt_lmsreward, /* resourcetype */
ITF_NOTLOST|ITF_CURSED, 0, 0, /* flags, weight, capacity */
0, NOSKILL, /* minskill, skill */
NULL, /* construction */
&use_lmsreward,
NULL
};
void
init_lmsreward(void)
{
it_register(&it_lmsreward);
at_register(&at_lmsstory);
}

16
src/common/items/lmsreward.h Normal file
View File

@ -0,0 +1,16 @@
/* vi: set ts=2:
*
* $Id: lmsreward.h,v 1.1 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
* Henning Peters (faroul@beyond.kn-bremen.de)
* Enno Rehling (enno@eressea-pbem.de)
* Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
*
* This program may not be used, modified or distributed without
* prior permission by the authors of Eressea.
*/
extern struct item_type it_lmsreward;
extern void init_lmsreward(void);

13
src/common/kernel/battle.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: battle.c,v 1.2 2001/01/26 16:19:39 enno Exp $
* $Id: battle.c,v 1.3 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -2205,7 +2205,6 @@ aftermath(battle * b)
s->alive = 0;
s->flee = 0;
s->dead = 0;
if (s->bf->faction->no!=MONSTER_FACTION) is += s->casualties;
for_each(df, s->fighters) {
unit *du = df->unit;
@ -2302,12 +2301,18 @@ aftermath(battle * b)
loot_items(df);
}
}
if (!nonplayer_race(du->race)) {
/* tote im kampf werden zu regionsuntoten:
* for each o them, a peasant will die as well */
is += dead;
}
} next(df);
} next(s);
dead_peasants = min(rpeasants(r), is);
rsetpeasants(r, rpeasants(r) - dead_peasants);
deathcounts(r, dead_peasants);
deathcounts(r, dead_peasants + is);
chaoscounts(r, dead_peasants / 2);
rsetpeasants(r, rpeasants(r) - dead_peasants);
for (bf=b->factions;bf;bf=bf->next) {
faction * f = bf->faction;

12
src/common/kernel/eressea.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: eressea.c,v 1.5 2001/01/30 23:16:16 enno Exp $
* $Id: eressea.c,v 1.6 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -2267,22 +2267,20 @@ hunger(unit * u, int need)
need -= lspp;
}
/* Gestorbene aus der Einheit nehmen. */
if (dead) {
attrib * a;
/* Gestorbene aus der Einheit nehmen,
* Sie bekommen keine Beerdingung. */
add_message(&u->faction->msgs, new_message(u->faction,
"starvation%u:unit%r:region%i:dead%i:live", u, r, dead, u->number-dead));
scale_number(u, u->number - dead);
a = a_find(r->attribs, &at_deathcount);
if (!a) a = a_add(&r->attribs, a_new(&at_deathcount));
a->data.i += dead;
deathcounts(r, dead);
}
if(hpsub > 0) {
/* Jetzt die Schäden der nicht gestorbenen abziehen. */
u->hp -= hpsub;
/* Meldung nur, wenn noch keine für Tote generiert. */
if(dead == 0) {
if (dead == 0) {
/* Durch unzureichende Ernährung wird %s geschwächt */
add_message(&u->faction->msgs, new_message(u->faction,
"malnourish%u:unit%r:region", u, r));

11
src/common/kernel/eressea.h
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: eressea.h,v 1.6 2001/01/30 20:02:05 enno Exp $
* $Id: eressea.h,v 1.7 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -170,8 +170,6 @@ extern settings global;
/* So lange kann die Partei nicht angegriffen werden */
#define IMMUN_GEGEN_ANGRIFF 6
/* erhöhen von Dämonen verspeiste Bauern den Deathcount ?*/
#undef DAEMON_DEATHCOUNT
#undef STUDY_IF_NOT_WORKING
/** Attackierende Einheiten können keine langen Befehle ausführen */
@ -184,11 +182,8 @@ extern settings global;
#define DMRISE 10
#define DMRISEHAFEN 20
/* Vermehrungsrate Bauern */
#define PEASANTGROWTH 4
#define LIFEEXPECTANCY (27*40)
/* Sterbechance Bauern */
#define PEASANTDIE 2
/* Vermehrungsrate Bauern (PEASANTDIE inklusive) */
#define PEASANTGROWTH 2
/* Vermehrung trotz 90% Auslastung */
#define PEASANTFORCE 75

10
src/common/kernel/item.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: item.c,v 1.4 2001/01/28 08:01:51 enno Exp $
* $Id: item.c,v 1.5 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -1291,12 +1291,6 @@ init_olditems(void)
}
}
static void
init_items(void) {
init_olditems();
}
const char *herbdata[3][MAXHERBS] =
{
{
@ -1798,7 +1792,7 @@ init_resources(void)
oldresourcetype[R_UNIT] = r_unit;
/* alte typen registrieren: */
init_items();
init_olditems();
init_oldherbs();
init_oldpotions();
}

372
src/common/kernel/kernel-6.dsp Normal file
View File

@ -0,0 +1,372 @@
# Microsoft Developer Studio Project File - Name="kernel" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=kernel - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "kernel-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "kernel-6.mak" CFG="kernel - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "kernel - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "kernel - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "kernel - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "kernel - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "kernel___W"
# PROP BASE Intermediate_Dir "kernel___W"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Debug\kernel.lib"
!ENDIF
# Begin Target
# Name "kernel - Win32 Release"
# Name "kernel - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\alchemy.h
# End Source File
# Begin Source File
SOURCE=.\battle.h
# End Source File
# Begin Source File
SOURCE=.\border.h
# End Source File
# Begin Source File
SOURCE=.\build.h
# End Source File
# Begin Source File
SOURCE=.\building.h
# End Source File
# Begin Source File
SOURCE=.\creation.h
# End Source File
# Begin Source File
SOURCE=.\curse.h
# End Source File
# Begin Source File
SOURCE=.\economy.h
# End Source File
# Begin Source File
SOURCE=.\eressea.h
# End Source File
# Begin Source File
SOURCE=.\faction.h
# End Source File
# Begin Source File
SOURCE=.\group.h
# End Source File
# Begin Source File
SOURCE=.\item.h
# End Source File
# Begin Source File
SOURCE=.\karma.h
# End Source File
# Begin Source File
SOURCE=.\laws.h
# End Source File
# Begin Source File
SOURCE=.\magic.h
# End Source File
# Begin Source File
SOURCE=.\message.h
# End Source File
# Begin Source File
SOURCE=.\monster.h
# End Source File
# Begin Source File
SOURCE=.\movement.h
# End Source File
# Begin Source File
SOURCE=.\names.h
# End Source File
# Begin Source File
SOURCE=.\objtypes.h
# End Source File
# Begin Source File
SOURCE=.\orders.h
# End Source File
# Begin Source File
SOURCE=.\pathfinder.h
# End Source File
# Begin Source File
SOURCE=.\plane.h
# End Source File
# Begin Source File
SOURCE=.\pool.h
# End Source File
# Begin Source File
SOURCE=.\race.h
# End Source File
# Begin Source File
SOURCE=.\randenc.h
# End Source File
# Begin Source File
SOURCE=.\region.h
# End Source File
# Begin Source File
SOURCE=.\render.h
# End Source File
# Begin Source File
SOURCE=.\reports.h
# End Source File
# Begin Source File
SOURCE=.\save.h
# End Source File
# Begin Source File
SOURCE=.\ship.h
# End Source File
# Begin Source File
SOURCE=.\skill.h
# End Source File
# Begin Source File
SOURCE=.\spell.h
# End Source File
# Begin Source File
SOURCE=.\spells.h
# End Source File
# Begin Source File
SOURCE=.\spy.h
# End Source File
# Begin Source File
SOURCE=.\study.h
# End Source File
# Begin Source File
SOURCE=.\teleport.h
# End Source File
# Begin Source File
SOURCE=.\terrain.h
# End Source File
# Begin Source File
SOURCE=.\unit.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\alchemy.c
# End Source File
# Begin Source File
SOURCE=.\battle.c
# End Source File
# Begin Source File
SOURCE=.\border.c
# End Source File
# Begin Source File
SOURCE=.\build.c
# End Source File
# Begin Source File
SOURCE=.\building.c
# End Source File
# Begin Source File
SOURCE=.\combatspells.c
# End Source File
# Begin Source File
SOURCE=.\curse.c
# End Source File
# Begin Source File
SOURCE=.\eressea.c
# End Source File
# Begin Source File
SOURCE=.\faction.c
# End Source File
# Begin Source File
SOURCE=.\group.c
# End Source File
# Begin Source File
SOURCE=.\item.c
# End Source File
# Begin Source File
SOURCE=.\karma.c
# End Source File
# Begin Source File
SOURCE=.\magic.c
# End Source File
# Begin Source File
SOURCE=.\message.c
# End Source File
# Begin Source File
SOURCE=.\movement.c
# End Source File
# Begin Source File
SOURCE=.\names.c
# End Source File
# Begin Source File
SOURCE=.\objtypes.c
# End Source File
# Begin Source File
SOURCE=.\orders.c
# End Source File
# Begin Source File
SOURCE=.\pathfinder.c
# End Source File
# Begin Source File
SOURCE=.\plane.c
# End Source File
# Begin Source File
SOURCE=.\pool.c
# End Source File
# Begin Source File
SOURCE=.\race.c
# End Source File
# Begin Source File
SOURCE=.\region.c
# End Source File
# Begin Source File
SOURCE=.\render.c
# End Source File
# Begin Source File
SOURCE=.\reports.c
# End Source File
# Begin Source File
SOURCE=.\save.c
# End Source File
# Begin Source File
SOURCE=.\ship.c
# End Source File
# Begin Source File
SOURCE=.\skill.c
# End Source File
# Begin Source File
SOURCE=.\spell.c
# End Source File
# Begin Source File
SOURCE=.\teleport.c
# End Source File
# Begin Source File
SOURCE=.\terrain.c
# End Source File
# Begin Source File
SOURCE=.\unit.c
# End Source File
# End Target
# End Project

7
src/common/kernel/movement.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: movement.c,v 1.2 2001/01/26 16:19:40 enno Exp $
* $Id: movement.c,v 1.3 2001/02/02 08:40:45 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -2072,10 +2072,11 @@ follow(void)
region * r;
for (r=regions;r;r=r->next) {
unit * u;
if (fval(u, FL_HADBATTLE)) continue;
for (u=r->units;u;u=u->next) {
attrib * a = a_find(u->attribs, &at_follow);
attrib * a;
strlist * o;
if (fval(u, FL_HADBATTLE)) continue;
a = a_find(u->attribs, &at_follow);
for (o=u->orders;o;o=o->next) {
if (igetkeyword(o->s) == K_FOLLOW
&& getparam() == P_UNIT) {

30
src/common/kernel/names.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: names.c,v 1.2 2001/01/26 16:19:40 enno Exp $
* $Id: names.c,v 1.3 2001/02/02 08:40:46 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -105,8 +105,8 @@ static const char *untot_nach[UNTOT_NACH] =
" aus der Unterwelt"
};
char *
untoten_name(unit * u)
const char *
untoten_name(const unit * u)
{
int uv, uu, un;
static char name[NAMESIZE + 1];
@ -191,8 +191,8 @@ static const char *skel_nach[SKEL_NACH] =
" aus der Unterwelt"
};
char *
skeleton_name(unit * u)
const char *
skeleton_name(const unit * u)
{
int uv, uu, un;
static char name[NAMESIZE + 1];
@ -274,8 +274,8 @@ static const char *zombie_nach[ZOM_NACH] =
" aus der Unterwelt"
};
char *
zombie_name(unit * u)
const char *
zombie_name(const unit * u)
{
int uv, uu, un;
static char name[NAMESIZE + 1];
@ -359,8 +359,8 @@ static const char *ghoul_nach[GHOUL_NACH] =
" aus der Unterwelt"
};
char *
ghoul_name(unit * u)
const char *
ghoul_name(const unit * u)
{
int uv, uu, un;
static char name[NAMESIZE + 1];
@ -511,8 +511,8 @@ shadow_name(const unit *u)
return "Schattendämonen";
}
char *
drachen_name(unit *u)
const char *
drachen_name(const unit *u)
{
static char name[NAMESIZE + 1];
region *r = u->region;
@ -626,7 +626,8 @@ static const char *drac_suf[DRAC_SUF] = {
"k"
};
char *dracoid_name(unit *u)
const char *
dracoid_name(const unit *u)
{
static char name[NAMESIZE + 1];
int mid_syllabels;
@ -646,10 +647,11 @@ char *dracoid_name(unit *u)
return name;
}
const char *abkz(char *s, size_t max)
const char *
abkz(const char *s, size_t max)
{
static char buf[32];
char *p = s;
const char *p = s;
unsigned int c = 0;
int bpt;
int i;

16
src/common/kernel/names.h
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: names.h,v 1.2 2001/01/26 16:19:40 enno Exp $
* $Id: names.h,v 1.3 2001/02/02 08:40:46 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -13,12 +13,12 @@
*/
char *untoten_name(struct unit * u);
char *skeleton_name(struct unit * u);
char *zombie_name(struct unit * u);
char *ghoul_name(struct unit * u);
char *drachen_name(struct unit *u);
char *dracoid_name(struct unit *u);
const char *untoten_name(const struct unit * u);
const char *skeleton_name(const struct unit * u);
const char *zombie_name(const struct unit * u);
const char *ghoul_name(const struct unit * u);
const char *drachen_name(const struct unit *u);
const char *dracoid_name(const struct unit *u);
const char *shadow_name(const struct unit *u);
const char *abkz(char *s, size_t max);
const char *abkz(const char *s, size_t max);
void name_unit(struct unit *u);

2
src/common/kernel/race.h
View File

@ -70,7 +70,7 @@ struct racedata {
int battle_flags;
int ec_flags;
race_t familiars[MAXMAGIETYP];
char *(*generate_name) (struct unit *);
const char *(*generate_name) (const struct unit *);
void (*age_function)(struct unit *u);
boolean (*move_allowed)(struct region *, struct region *);
};

31
src/common/kernel/region.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: region.c,v 1.4 2001/01/31 17:40:51 corwin Exp $
* $Id: region.c,v 1.5 2001/02/02 08:40:46 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -105,7 +105,7 @@ woodcount(const region * r) {
}
void
deathcounts(region * r, int fallen) {
deathcounts (region * r, int fallen) {
attrib * a;
if (fallen==0) return;
@ -115,7 +115,7 @@ deathcounts(region * r, int fallen) {
if (!a) a = a_add(&r->attribs, a_new(&at_deathcount));
a->data.i += fallen;
if (a->data.i==0) a_remove(&r->attribs, a);
if (a->data.i<=0) a_remove(&r->attribs, a);
}
void
@ -128,7 +128,7 @@ chaoscounts(region * r, int fallen) {
if (!a) a = a_add(&r->attribs, a_new(&at_chaoscount));
a->data.i += fallen;
if (a->data.i==0) a_remove(&r->attribs, a);
if (a->data.i<=0) a_remove(&r->attribs, a);
}
void
@ -141,7 +141,7 @@ woodcounts(region * r, int fallen) {
if (!a) a = a_add(&r->attribs, a_new(&at_woodcount));
a->data.i += fallen;
if (a->data.i==0) a_remove(&r->attribs, a);
if (a->data.i<=0) a_remove(&r->attribs, a);
}
/********************/
@ -385,7 +385,8 @@ attrib_type at_horseluck = {
DEFAULT_FINALIZE,
DEFAULT_AGE,
NO_WRITE,
NO_READ
NO_READ,
ATF_UNIQUE
};
@ -398,7 +399,8 @@ attrib_type at_peasantluck = {
DEFAULT_FINALIZE,
DEFAULT_AGE,
NO_WRITE,
NO_READ
NO_READ,
ATF_UNIQUE
};
/*********************/
@ -410,7 +412,8 @@ attrib_type at_chaoscount = {
DEFAULT_FINALIZE,
DEFAULT_AGE,
DEFAULT_WRITE,
DEFAULT_READ
DEFAULT_READ,
ATF_UNIQUE
};
/*********************/
@ -422,7 +425,8 @@ attrib_type at_deathcount = {
DEFAULT_FINALIZE,
DEFAULT_AGE,
DEFAULT_WRITE,
DEFAULT_READ
DEFAULT_READ,
ATF_UNIQUE
};
/*********************/
@ -434,7 +438,8 @@ attrib_type at_woodcount = {
DEFAULT_FINALIZE,
DEFAULT_AGE,
DEFAULT_WRITE,
DEFAULT_READ
DEFAULT_READ,
ATF_UNIQUE
};
/*********************/
@ -458,7 +463,8 @@ attrib_type at_laen = {
DEFAULT_FINALIZE,
DEFAULT_AGE,
DEFAULT_WRITE,
DEFAULT_READ
DEFAULT_READ,
ATF_UNIQUE
};
void
@ -774,10 +780,7 @@ terraform(region * r, terrain_t t)
{
if (terrain[t].production_max && !fval(r, RF_CHAOTIC)) {
int np = MAXPEASANTS_PER_AREA * (rand() % (terrain[t].production_max / 2));
int average;
rsetpeasants(r, max(100, np));
average = (int)(rpeasants(r)/(PEASANTGROWTH*0.01)/LIFEEXPECTANCY);
deathcounts(r, average); /* Gräber der Ahnen in der Region */
rsetmoney(r, rpeasants(r) * ((wage(r, NULL, false)+1) + rand() % 5));
}
}

3
src/common/kernel/save.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: save.c,v 1.6 2001/01/30 23:16:17 enno Exp $
* $Id: save.c,v 1.7 2001/02/02 08:40:46 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -1057,6 +1057,7 @@ readgame(boolean backup)
rsetmoney(r, ri(F));
if (global.data_version<ATTRIBFIX_VERSION) ri(F);
}
if (global.data_version<MEMSAVE_VERSION) {
int chaoscount = ri(F);
int deathcount = ri(F);

7
src/common/kernel/spell.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: spell.c,v 1.5 2001/01/31 17:40:51 corwin Exp $
* $Id: spell.c,v 1.6 2001/02/02 08:40:46 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -1975,7 +1975,6 @@ sp_create_sack_of_conservation(castorder *co)
static int
sp_holyground(castorder *co)
{
unit *u;
region *r = co->rt;
unit *mage = (unit *)co->magician;
int cast_level = co->level;
@ -1986,7 +1985,7 @@ sp_holyground(castorder *co)
set_curseflag(mage->building->attribs, C_HOLYGROUND, 0, CURSE_NOAGE);
add_message(&r->msgs, new_message(mage->faction, "holyground%u:mage", u));
add_message(&r->msgs, new_message(mage->faction, "holyground%u:mage", mage));
a_removeall(&r->attribs, &at_deathcount);
@ -3505,7 +3504,7 @@ sp_summonundead(castorder *co)
int force = co->force;
race_t race = RC_SKELETON;
if (rterrain(r) == T_OCEAN || deathcount(r) == 0) {
if (!r->land || deathcount(r) == 0) {
sprintf(buf, "%s in %s: In %s sind keine Gräber.", unitname(mage),
regionid(mage->region), regionid(r));
addmessage(0, mage->faction, buf, MSG_MAGIC, ML_MISTAKE);

4
src/common/modules/arena.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: arena.c,v 1.2 2001/01/31 07:59:42 enno Exp $
* $Id: arena.c,v 1.3 2001/02/02 08:40:46 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -548,7 +548,7 @@ void
init_arena(void)
{
at_register(&at_hurting);
it_register(&it_demonseye);
init_demonseye();
it_register(&it_arenagate);
it_register(&it_gryphonwing);
register_function((pf_generic)use_wand_of_tears, "use_wand_of_tears");

144
src/common/modules/modules-6.dsp Normal file
View File

@ -0,0 +1,144 @@
# Microsoft Developer Studio Project File - Name="modules" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=modules - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "modules-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "modules-6.mak" CFG="modules - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "modules - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "modules - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "modules"
# PROP BASE Intermediate_Dir "modules"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Debug\modules.lib"
!ENDIF
# Begin Target
# Name "modules - Win32 Release"
# Name "modules - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\arena.h
# End Source File
# Begin Source File
SOURCE=.\gmcmd.h
# End Source File
# Begin Source File
SOURCE=.\museum.h
# End Source File
# Begin Source File
SOURCE=.\oceannames.h
# End Source File
# Begin Source File
SOURCE=.\score.h
# End Source File
# Begin Source File
SOURCE=.\weather.h
# End Source File
# Begin Source File
SOURCE=.\xmas2000.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\arena.c
# End Source File
# Begin Source File
SOURCE=.\gmcmd.c
# End Source File
# Begin Source File
SOURCE=.\museum.c
# End Source File
# Begin Source File
SOURCE=.\oceannames.c
# End Source File
# Begin Source File
SOURCE=.\score.c
# End Source File
# Begin Source File
SOURCE=.\weather.c
# End Source File
# Begin Source File
SOURCE=.\xmas2000.c
# End Source File
# End Target
# End Project

112
src/common/races/races-6.dsp Normal file
View File

@ -0,0 +1,112 @@
# Microsoft Developer Studio Project File - Name="races" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=races - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "races-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "races-6.mak" CFG="races - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "races - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "races - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "races - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "races - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "races"
# PROP BASE Intermediate_Dir "races"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Debug\races.lib"
!ENDIF
# Begin Target
# Name "races - Win32 Release"
# Name "races - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\dragons.h
# End Source File
# Begin Source File
SOURCE=.\illusion.h
# End Source File
# Begin Source File
SOURCE=.\zombies.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\dragons.c
# End Source File
# Begin Source File
SOURCE=.\illusion.c
# End Source File
# Begin Source File
SOURCE=.\zombies.c
# End Source File
# End Target
# End Project

104
src/common/spells/spells-6.dsp Normal file
View File

@ -0,0 +1,104 @@
# Microsoft Developer Studio Project File - Name="spells" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=spells - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "spells-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "spells-6.mak" CFG="spells - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "spells - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "spells - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "spells - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "spells - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "spells"
# PROP BASE Intermediate_Dir "spells"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Debug\spells.lib"
!ENDIF
# Begin Target
# Name "spells - Win32 Release"
# Name "spells - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\alp.h
# End Source File
# Begin Source File
SOURCE=.\spells.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\alp.c
# End Source File
# Begin Source File
SOURCE=.\spells.c
# End Source File
# End Target
# End Project

176
src/common/triggers/triggers-6.dsp Normal file
View File

@ -0,0 +1,176 @@
# Microsoft Developer Studio Project File - Name="triggers" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=triggers - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "triggers-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "triggers-6.mak" CFG="triggers - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "triggers - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "triggers - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "triggers - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "triggers - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "triggers"
# PROP BASE Intermediate_Dir "triggers"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Debug\triggers.lib"
!ENDIF
# Begin Target
# Name "triggers - Win32 Release"
# Name "triggers - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\changefaction.h
# End Source File
# Begin Source File
SOURCE=.\changerace.h
# End Source File
# Begin Source File
SOURCE=.\createcurse.h
# End Source File
# Begin Source File
SOURCE=.\createunit.h
# End Source File
# Begin Source File
SOURCE=.\giveitem.h
# End Source File
# Begin Source File
SOURCE=.\killunit.h
# End Source File
# Begin Source File
SOURCE=.\removecurse.h
# End Source File
# Begin Source File
SOURCE=.\shock.h
# End Source File
# Begin Source File
SOURCE=.\timeout.h
# End Source File
# Begin Source File
SOURCE=.\triggers.h
# End Source File
# Begin Source File
SOURCE=.\unitmessage.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\changefaction.c
# End Source File
# Begin Source File
SOURCE=.\changerace.c
# End Source File
# Begin Source File
SOURCE=.\createcurse.c
# End Source File
# Begin Source File
SOURCE=.\createunit.c
# End Source File
# Begin Source File
SOURCE=.\giveitem.c
# End Source File
# Begin Source File
SOURCE=.\killunit.c
# End Source File
# Begin Source File
SOURCE=.\removecurse.c
# End Source File
# Begin Source File
SOURCE=.\shock.c
# End Source File
# Begin Source File
SOURCE=.\timeout.c
# End Source File
# Begin Source File
SOURCE=.\triggers.c
# End Source File
# Begin Source File
SOURCE=.\unitmessage.c
# End Source File
# End Target
# End Project

204
src/common/util/util-6.dsp Normal file
View File

@ -0,0 +1,204 @@
# Microsoft Developer Studio Project File - Name="util" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=util - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "util-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "util-6.mak" CFG="util - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "util - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "util - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "util - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "util - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# 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 "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407
# ADD RSC /l 0x407
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"Debug\util.lib"
!ENDIF
# Begin Target
# Name "util - Win32 Release"
# Name "util - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\attrib.h
# End Source File
# Begin Source File
SOURCE=.\base36.h
# End Source File
# Begin Source File
SOURCE=.\cvector.h
# End Source File
# Begin Source File
SOURCE=.\event.h
# End Source File
# Begin Source File
SOURCE=.\functions.h
# End Source File
# Begin Source File
SOURCE=.\goodies.h
# End Source File
# Begin Source File
SOURCE=.\language.h
# End Source File
# Begin Source File
SOURCE=.\lists.h
# End Source File
# Begin Source File
SOURCE=.\rand.h
# End Source File
# Begin Source File
SOURCE=.\resolve.h
# End Source File
# Begin Source File
SOURCE=.\umlaut.h
# End Source File
# Begin Source File
SOURCE=.\vmap.h
# End Source File
# Begin Source File
SOURCE=.\vset.h
# End Source File
# Begin Source File
SOURCE=.\windir.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\attrib.c
# End Source File
# Begin Source File
SOURCE=.\base36.c
# End Source File
# Begin Source File
SOURCE=.\cvector.c
# End Source File
# Begin Source File
SOURCE=.\dice.c
# End Source File
# Begin Source File
SOURCE=.\event.c
# End Source File
# Begin Source File
SOURCE=.\functions.c
# End Source File
# Begin Source File
SOURCE=.\goodies.c
# End Source File
# Begin Source File
SOURCE=.\language.c
# End Source File
# Begin Source File
SOURCE=.\lists.c
# End Source File
# Begin Source File
SOURCE=.\rand.c
# End Source File
# Begin Source File
SOURCE=.\resolve.c
# End Source File
# Begin Source File
SOURCE=.\umlaut.c
# End Source File
# Begin Source File
SOURCE=.\vmap.c
# End Source File
# Begin Source File
SOURCE=.\vset.c
# End Source File
# Begin Source File
SOURCE=.\windir.c
# End Source File
# End Target
# End Project

8
src/doc/coding.txt Normal file
View File

@ -0,0 +1,8 @@
- Die Variable buf
wird an zu vielen Stellen im Source benutzt. Können wir zumindest in Zukunft versuchen, auf sie zu verzichten? Mir ist nie sehr wohl, wen ich die irgendwo sehe.
- Bibliotheken, module
Jedes Verzeichnis in common/ erzeugt eine Bibliothek. Je nach Bedarf muss aber nicht jeder Server die ganze Bibliothek linken (die ist eher was für den mapper), sondern kann die Files auch einzeln linken.
Jedes modul, item, attribut, usw. sollte eine Funktion zur Verfügung stellen, die seine typen initialisiert, also it_register respektive at_register o.ä. aufruft. Jede Biliothek hat ein File, das ihren Namen trägt (z.b. items.txt) mit einer eigenen init_-Funktion, die alle init_funktionen der enthaltenen objekte enthält. (init_items, init_attributes, usw).
Neue Files hinzufügen heißt also bitte, die Registrierung in den "bibliotheks-file" zu machen.

209
src/eressea-6.dsw Normal file
View File

@ -0,0 +1,209 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "askalon"=".\askalon\askalon-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name attributes
End Project Dependency
Begin Project Dependency
Project_Dep_Name gamecode
End Project Dependency
Begin Project Dependency
Project_Dep_Name kernel
End Project Dependency
Begin Project Dependency
Project_Dep_Name triggers
End Project Dependency
Begin Project Dependency
Project_Dep_Name util
End Project Dependency
}}}
###############################################################################
Project: "attributes"=".\common\attributes\attributes-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "eressea"=".\eressea\eressea-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name kernel
End Project Dependency
Begin Project Dependency
Project_Dep_Name util
End Project Dependency
Begin Project Dependency
Project_Dep_Name gamecode
End Project Dependency
}}}
###############################################################################
Project: "gamecode"=".\common\gamecode\gamecode-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "items"=".\common\items\items-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "kernel"=".\common\kernel\kernel-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "mapper"=".\mapper\mapper-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name triggers
End Project Dependency
Begin Project Dependency
Project_Dep_Name util
End Project Dependency
Begin Project Dependency
Project_Dep_Name kernel
End Project Dependency
Begin Project Dependency
Project_Dep_Name attributes
End Project Dependency
Begin Project Dependency
Project_Dep_Name items
End Project Dependency
Begin Project Dependency
Project_Dep_Name modules
End Project Dependency
Begin Project Dependency
Project_Dep_Name races
End Project Dependency
Begin Project Dependency
Project_Dep_Name spells
End Project Dependency
}}}
###############################################################################
Project: "modules"=".\common\modules\modules-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "races"=".\common\races\races-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "spells"=".\common\spells\spells-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "triggers"=".\common\triggers\triggers-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "util"=".\common\util\util-6.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

5
src/eressea/attributes.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: attributes.c,v 1.2 2001/01/26 16:19:41 enno Exp $
* $Id: attributes.c,v 1.3 2001/02/02 08:40:48 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -18,6 +18,7 @@
/* attributes includes */
#include <attributes/key.h>
#include <attributes/orcification.h>
#include <attributes/targetregion.h>
#include <attributes/reduceproduction.h>
#include <attributes/follow.h>
@ -34,6 +35,8 @@ init_attributes(void)
init_iceberg();
/* at_key */
init_key();
/* at_orcification */
init_orcification();
/* at_follow */
init_follow();
/* at_targetregion */

858
src/eressea/eressea-6.dsp Normal file
View File

@ -0,0 +1,858 @@
# Microsoft Developer Studio Project File - Name="eressea" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=eressea - Win32 Conversion
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "eressea-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "eressea-6.mak" CFG="eressea - Win32 Conversion"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "eressea - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "eressea - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE "eressea - Win32 Conversion" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "eressea - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "eressea_"
# PROP BASE Intermediate_Dir "eressea_"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "eressea0"
# PROP BASE Intermediate_Dir "eressea0"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# 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 ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo /S (*.h ../*.h ../common/kernel/eressea.h ../common/util/*.h ../common/triggers/*.h) ../common/kernel/Debug/*.sbr ../common/triggers/Debug/*.sbr ../common/util/Debug/*.sbr
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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/eressea.exe" /pdbtype:sept
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "eressea_"
# PROP BASE Intermediate_Dir "eressea_"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "eressea_"
# PROP Intermediate_Dir "eressea_"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /Za /W4 /Gm /Zi /Od /I ".." /I "../util" /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MDd /Za /W4 /Gm /ZI /Od /I ".." /I "../util" /I "../common" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "CONVERT_TRIGGER" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "eressea - Win32 Release"
# Name "eressea - Win32 Debug"
# Name "eressea - Win32 Conversion"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=..\common\modules\arena.h
# End Source File
# Begin Source File
SOURCE=.\attributes.h
# End Source File
# Begin Source File
SOURCE=..\common\modules\museum.h
# End Source File
# Begin Source File
SOURCE=..\common\modules\score.h
# End Source File
# Begin Source File
SOURCE=.\weapons.h
# End Source File
# Begin Source File
SOURCE=..\common\modules\xmas2000.h
# End Source File
# End Group
# Begin Group "Conversion"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\old\pointertags.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\old\relation.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\old\trigger.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# End Group
# Begin Group "Races"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\common\races\dragons.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\races\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\races\dragons.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\races\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\races\illusion.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\races\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\races\illusion.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\races\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\races\zombies.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\races\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\races\zombies.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\races\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# End Group
# Begin Group "Items"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\common\items\demonseye.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\items\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\items\demonseye.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\items\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\items\lmsreward.c
# End Source File
# Begin Source File
SOURCE=..\common\items\lmsreward.h
# End Source File
# Begin Source File
SOURCE=..\common\items\weapons.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\items\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\items\weapons.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\items\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# End Group
# Begin Group "Modules"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\common\modules\arena.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\modules\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\modules\museum.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\modules\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\modules\oceannames.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\modules\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\modules\score.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\modules\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\modules\xmas2000.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\modules\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# End Group
# Begin Group "Attributes"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\common\attributes\follow.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\follow.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\giveitem.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\giveitem.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\hate.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\hate.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\iceberg.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\iceberg.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\key.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\key.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\matmod.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\matmod.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\reduceproduction.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\reduceproduction.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\targetregion.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\attributes\targetregion.h
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\attributes\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# End Group
# Begin Group "Triggers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\common\triggers\changefaction.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\changerace.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\createcurse.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\createunit.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\giveitem.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\killunit.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\removecurse.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\shock.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\timeout.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\common\triggers\unitmessage.c
!IF "$(CFG)" == "eressea - Win32 Release"
!ELSEIF "$(CFG)" == "eressea - Win32 Debug"
# PROP Intermediate_Dir "..\common\triggers\Debug"
!ELSEIF "$(CFG)" == "eressea - Win32 Conversion"
!ENDIF
# End Source File
# End Group
# Begin Source File
SOURCE=.\attributes.c
# End Source File
# Begin Source File
SOURCE=..\common\modules\gmcmd.c
# End Source File
# Begin Source File
SOURCE=.\korrektur.c
# End Source File
# Begin Source File
SOURCE=.\main.c
# End Source File
# Begin Source File
SOURCE=..\common\attributes\orcification.c
# End Source File
# Begin Source File
SOURCE=.\triggers.c
# End Source File
# End Target
# End Project

92
src/eressea/korrektur.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: korrektur.c,v 1.9 2001/01/31 17:40:52 corwin Exp $
* $Id: korrektur.c,v 1.10 2001/02/02 08:40:48 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -83,7 +83,7 @@ fix_skills(void)
/* make sure that this is done only once! */
while (a && a->data.i!=magic) a=a->next;
if (a) {
fprintf(stderr, "WARNING: fix_deathcounts() was called a second time\n");
fprintf(stderr, "WARNING: fix_skills() was called a second time\n");
return;
}
a_add(&global.attribs, a_new(&at_key))->data.i = magic;
@ -108,38 +108,16 @@ fix_skills(void)
}
}
#if 0
static void
fix_deathcount(double mod)
{
int magic = atoi36("dcnt");
region * r;
attrib * a = a_find(global.attribs, &at_key);
/* make sure that this is done only once! */
while (a && a->data.i!=magic) a=a->next;
if (a) {
fprintf(stderr, "WARNING: fix_deathcounts() was called a second time\n");
return;
}
a_add(&global.attribs, make_key(magic));
for (r=regions;r;r=r->next) {
deathcounts(r, (int)(deathcount(r)*mod));
}
}
#endif
static void
do_once(int magic, void (*fun)(void))
{
attrib * a = a_find(global.attribs, &at_key);
/* make sure that this is done only once! */
while (a && a->data.i!=magic) a=a->next;
if (a) {
fprintf(stderr, "WARNING: a unique fix was called a second time\n");
return;
}
else fun();
/* make sure that this is done only once! */
#define do_once(magic, fun) \
{ \
attrib * a = a_find(global.attribs, &at_key); \
while (a && a->data.i!=(magic)) a=a->next; \
if (a) { \
fprintf(stderr, "WARNING: a unique fix was called a second time\n"); \
return; \
} \
else (fun); \
}
static void
@ -763,10 +741,10 @@ remove_impossible_dragontargets(void)
for (r=regions;r;r=r->next) {
unit *u;
for (u=r->units;u;u=u->next) {
attrib *a, *an;
attrib *a;
if(u->faction->no != MONSTER_FACTION) continue;
a = a_find(an, &at_targetregion);
a = a_find(u->attribs, &at_targetregion);
if (a!=NULL) {
boolean cango = false;
region * r2 = a->data.v;
@ -1265,26 +1243,6 @@ write_laenrepair(void) {
}
#endif
#if 0
static void
fix_deathcounts(void)
{
region * r;
/* Regionen, die sehr wenig Gräber haben, sollten einen sinnvollen Startwert bekommen. */
for (r=regions;r;r=r->next) {
int dc = deathcount(r);
int peasants = rpeasants(r);
int average = (int)(peasants/(PEASANTGROWTH*0.01)/LIFEEXPECTANCY);
if (dc<average*0.5) {
deathcounts(r, average);
}
}
}
#endif
#include "group.h"
static void
fix_allies(void) {
@ -1744,10 +1702,23 @@ convert_triggers(void)
}
#endif
#include <items/lmsreward.h>
static void
lms_special(unit * u)
{
/* TODO: Trollstärke-gürtel und trigger an die einheit geben */
i_change(&u->items, &it_lmsreward, 1);
}
#define LIFEEXPECTANCY (27*40)
static void
undo_deadpeasants(void)
{
region * r = regions;
while (r) {
int dead = rpeasants(r) / LIFEEXPECTANCY;
deathcounts(r, -dead);
r = r->next;
}
}
#include <modules/gmcmd.h>
@ -1764,7 +1735,7 @@ korrektur(void)
/* fix_herbtypes(); */
#ifdef CONVERT_TRIGGER
do_once(atoi36("cvtr"), convert_triggers);
do_once(atoi36("cvtr"), convert_triggers());
#endif
fix_migrants();
fix_allies();
@ -1816,8 +1787,9 @@ korrektur(void)
init_mwarden();
break;
}
do_once(atoi36("fxfa"), fix_vertrautenmagie);
do_once(atoi36("fxfa"), fix_vertrautenmagie());
do_once(atoi36("uddp"), undo_deadpeasants());
do_once(atoi36("lmsr"), lms_special(findunit(atoi36(""))))
/* fix_hp(); */ /* checkt, ob irgendwer absurde hitpoints hat. */
/* trade_orders(); */

15
src/eressea/main.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2:
*
* $Id: main.c,v 1.7 2001/01/31 07:59:43 enno Exp $
* $Id: main.c,v 1.8 2001/02/02 08:40:48 enno Exp $
* Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.kn-bremen.de)
@ -35,6 +35,8 @@
#include <eressea.h>
/* initialization - TODO: init in separate module */
#include <items/lmsreward.h>
#include <items/demonseye.h>
#include <items/weapons.h>
#include <attributes/attributes.h>
@ -98,6 +100,13 @@ int mapdetail = 0;
extern void render_init(void);
static void init_items(void)
{
init_weapons();
init_demonseye();
init_lmsreward();
}
static void
init_game(void)
{
@ -105,9 +114,11 @@ init_game(void)
init_locales();
init_resources();
init_weapons();
init_items();
init_attributes();
init_demonseye();
#ifdef USE_GM_COMMANDS
init_gmcmd();
#endif

133
src/mapper/mapper-6.dsp Normal file
View File

@ -0,0 +1,133 @@
# Microsoft Developer Studio Project File - Name="mapper" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=mapper - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "mapper-6.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "mapper-6.mak" CFG="mapper - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "mapper - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "mapper - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "mapper - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "mapper - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# 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 ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX"stdafx.h" /FD /c
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo /S (*.h ../*.h ../kernel/eressea.h ../util/*.h ../triggers/*.h) ../kernel/Debug/*.sbr ../triggers/Debug/*.sbr ../util/Debug/*.sbr
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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 curses.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/mapper.exe" /pdbtype:sept
!ENDIF
# Begin Target
# Name "mapper - Win32 Release"
# Name "mapper - Win32 Debug"
# Begin Group "Header"
# PROP Default_Filter "*.h"
# Begin Source File
SOURCE=.\mapper.h
# End Source File
# Begin Source File
SOURCE=..\modules\oceannames.h
# End Source File
# Begin Source File
SOURCE=..\modules\score.h
# End Source File
# Begin Source File
SOURCE=..\common\triggers\triggers.h
# End Source File
# Begin Source File
SOURCE=..\modules\weather.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\map_modify.c
# End Source File
# Begin Source File
SOURCE=.\map_partei.c
# End Source File
# Begin Source File
SOURCE=.\map_region.c
# End Source File
# Begin Source File
SOURCE=.\map_tools.c
# End Source File
# Begin Source File
SOURCE=.\map_units.c
# End Source File
# Begin Source File
SOURCE=.\mapper.c
# End Source File
# End Target
# End Project

101
src/tools/reduce-6.dsp Normal file
View File

@ -0,0 +1,101 @@
# Microsoft Developer Studio Project File - Name="reduce" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=reduce - Win32 Debug
!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit\
NMAKE
!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den\
Befehl
!MESSAGE
!MESSAGE NMAKE /f "reduce-5.mak".
!MESSAGE
!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "reduce-5.mak" CFG="reduce - Win32 Debug"
!MESSAGE
!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
!MESSAGE "reduce - Win32 Release" (basierend auf\
"Win32 (x86) Console Application")
!MESSAGE "reduce - Win32 Debug" (basierend auf\
"Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "reduce - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "reduce - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# 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 /G5 /Zp1 /MDd /Za /W4 /Gm /Gi /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "reduce - Win32 Release"
# Name "reduce - Win32 Debug"
# Begin Source File
SOURCE=..\museum.c
# End Source File
# Begin Source File
SOURCE=.\reduce.c
# End Source File
# Begin Source File
SOURCE=..\weapons.c
# End Source File
# End Target
# End Project