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

bugfix segfault durch kaputte message

This commit is contained in:
Enno Rehling 2001-04-22 20:17:25 +00:00
parent 87be055747
commit df88ebdf83
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/gamecode/gamecode-6.dsp
View File

@ -7,21 +7,21 @@
CFG=gamecode - Win32 Conversion CFG=gamecode - Win32 Conversion
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "gamecode-6.mak". !MESSAGE NMAKE /f "gamecode-6.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "gamecode-6.mak" CFG="gamecode - Win32 Conversion" !MESSAGE NMAKE /f "gamecode-6.mak" CFG="gamecode - Win32 Conversion"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "gamecode - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "gamecode - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "gamecode - Win32 Debug" (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 "gamecode - Win32 Conversion" (based on "Win32 (x86) Static Library")
!MESSAGE "gamecode - Win32 Profile" (based on "Win32 (x86) Static Library") !MESSAGE "gamecode - Win32 Profile" (based on "Win32 (x86) Static Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../kernel" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../kernel" /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x407 # ADD BASE RSC /l 0x407
# ADD RSC /l 0x407 # ADD RSC /l 0x407
BSC32=bscmake.exe BSC32=bscmake.exe
@ -124,7 +124,7 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo # ADD LIB32 /nologo
!ENDIF !ENDIF
# Begin Target # Begin Target

8
src/res/de/messages.xml
View File

@ -3956,18 +3956,18 @@
<message name="donation"> <message name="donation">
<type> <type>
<arg name="from" type="unit"></arg> <arg name="from" type="faction"></arg>
<arg name="amount" type="int"></arg> <arg name="amount" type="int"></arg>
<arg name="to" type="unit"></arg> <arg name="to" type="faction"></arg>
</type> </type>
<locale name="de"> <locale name="de">
<nr section="events"> <nr section="events">
<text>"$unit($from) spendete $int($amount) Silber an $unit($to)."</text> <text>"$faction($from) spendete $int($amount) Silber an $faction($to)."</text>
</nr> </nr>
</locale> </locale>
<locale name="en"> <locale name="en">
<nr section="none"> <nr section="none">
<text>"$unit($from) donates $int($amount) silver to $unit($to)."</text> <text>"$faction($from) donates $int($amount) silver to $faction($to)."</text>
</nr> </nr>
</locale> </locale>
</message> </message>