- NSIS changes from 2.3 (#1111).

- Additional fixes to [9642]: remove old-1.10-balance.wz instead of origianl.wz. - MinGW build system updates. git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9727 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-07 19:12:26 +00:00 · 2010-02-07 19:12:26 +00:00 · cec20aae6a
parent 6b22f1855d
commit cec20aae6a
8 changed files with 269 additions and 87 deletions
--- a/data/makefile.win32
+++ b/data/makefile.win32
@ -8,6 +8,7 @@ SUBDIRS=mods
 BASELIST= \
 	anims \
 	audio \
+	challenges \
 	components \
 	effects \
 	features \
@ -16,10 +17,10 @@ BASELIST= \
 	messages \
 	misc \
 	multiplay \
+	palette.txt \
 	script \
 	sequenceaudio \
 	stats \
-	stats-sql \
 	structs \
 	tagdefinitions \
 	texpages \
@ -39,30 +40,31 @@ MPLIST= \
 BASEARCHIVE=base.wz
 MPARCHIVE=mp.wz

-CLEANFILES=$(BASEARCHIVE) $(MPARCHIVE)
+ZIPLIST=$(BASEARCHIVE) $(MPARCHIVE)

 include $(top_srcdir)/makerules/submake.mk

-.PHONY: all clean $(BASEARCHIVE) $(MPARCHIVE) $(SUBDIRS)
+.PHONY: all clean $(ZIPLIST) $(SUBDIRS)

 all:
 ifdef INSTALLER
-all: $(BASEARCHIVE) $(MPARCHIVE) $(SUBDIRS)
+all: $(ZIPLIST) $(SUBDIRS)
 endif

 stamp:
 	echo > stamp

+# zip returns 12 on "nothing to do"
+
 $(BASEARCHIVE): $(basename $(BASEARCHIVE)) stamp $(patsubst %,$(basename $(BASEARCHIVE))/%,$(BASELIST))
-	(cd $< && zip -ru0 $@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
+	cd $< && zip -r1 ..\$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*'
 	zip -T $@
 	$(RM_F) stamp

 $(MPARCHIVE): $(basename $(MPARCHIVE)) stamp $(patsubst %,$(basename $(MPARCHIVE))/%,$(MPLIST))
-	(cd $< && zip -ru0 $@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
+	cd $< && zip -r1 ..\$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*'
 	zip -T $@
 	$(RM_F) stamp

 clean: $(SUBDIRS)
-	$(RM_F) $(BASEARCHIVE)
-	$(RM_F) $(MPARCHIVE)
+	$(RM_F) $(ZIPLIST)
--- a/data/mods/multiplay/makefile.win32
+++ b/data/mods/multiplay/makefile.win32
@ -35,34 +35,33 @@ AIVOLUTIONLIST= \

 AIVOLUTIONARCHIVE=aivolution.wz

+ZIPLIST=$(OLD110ARCHIVE) $(NTWARCHIVE) $(AIVOLUTIONARCHIVE)


-CLEANFILES=$(OLD110ARCHIVE) $(NTWARCHIVE) $(AIVOLUTIONARCHIVE) 
-
-.PHONY: all clean $(OLD110ARCHIVE) $(NTWARCHIVE) $(AIVOLUTIONARCHIVE) 
+.PHONY: all clean $(ZIPLIST)

 all:
 ifdef INSTALLER
-all: $(OLD110ARCHIVE) $(NTWARCHIVE) $(AIVOLUTIONARCHIVE) 
+all: $(ZIPLIST)
 endif

 stamp:
 	echo stamp > stamp

 $(OLD110ARCHIVE): $(basename $(OLD110ARCHIVE)) stamp $(patsubst %,$(basename $(OLD110ARCHIVE))/%,$(OLD110LIST))
-	(cd $< && zip -ru0 $@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
+	cd $< && zip -r1 ..\$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*'
 	zip -T $@
 	$(RM_F) stamp

 $(NTWARCHIVE): $(basename $(NTWARCHIVE)) stamp $(patsubst %,$(basename $(NTWARCHIVE))/%,$(NTWLIST))
-	(cd $< && zip -ru0 $@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
+	cd $< && zip -r1 ..\$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*'
 	zip -T $@
 	$(RM_F) stamp

 $(AIVOLUTIONARCHIVE): $(basename $(AIVOLUTIONARCHIVE)) stamp $(patsubst %,$(basename $(AIVOLUTIONARCHIVE))/%,$(AIVOLUTIONLIST))
-	(cd $< && zip -ru0 $@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
+	cd $< && zip -r1 ..\$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*'
 	zip -T $@
 	$(RM_F) stamp

 clean:
-	$(RM_F) $(OLD110ARCHIVE) $(NTWARCHIVE) $(AIVOLUTIONARCHIVE) 
+	$(RM_F) $(ZIPLIST) 
--- a/icons/wz2100welcome.bmp
+++ b/icons/wz2100welcome.bmp
--- a/lib/framework/makefile.win32
+++ b/lib/framework/makefile.win32
@ -33,6 +33,6 @@ SRC= \

 LIB=framework

-CLEANFILES=strres_parser.tab.h resource_parser.tab.h
+CLEANFILES=strres_parser.tab.h resource_parser.tab.h $(PARSERS)

 include $(top_srcdir)/makerules/lib.mk
--- a/lib/gamelib/makefile.win32
+++ b/lib/gamelib/makefile.win32
@ -18,6 +18,6 @@ SRC= \

 LIB=gamelib

-CLEANFILES=audp_parser.tab.h
+CLEANFILES=audp_parser.tab.h $(PARSERS)

 include $(top_srcdir)/makerules/lib.mk
--- a/lib/script/makefile.win32
+++ b/lib/script/makefile.win32
@ -22,8 +22,6 @@ SRC= \

 LIB=script

-CLEANFILES= \
-	chat_parser.tab.h \
-	script_parser.tab.h
+CLEANFILES=chat_parser.tab.h script_parser.tab.h $(PARSERS)

 include $(top_srcdir)/makerules/lib.mk
--- a/pkg/nsis/warzone2100.nsi
+++ b/pkg/nsis/warzone2100.nsi
@ -21,15 +21,16 @@
 ;

 ;--------------------------------
-;Include Modern UI
+;Include section

  !include "MUI.nsh"
  !include "FileFunc.nsh"
+  !include "LogicLib.nsh"

 ;--------------------------------
 ;General
-   CRCCheck on   ;make sure this isn't corrupted
-   SetCompressor /SOLID  lzma
+  CRCCheck on   ;make sure this isn't corrupted
+  SetCompressor /SOLID  lzma

  ;Name and file
  Name "${PACKAGE_NAME}"
@ -41,6 +42,9 @@
  ;Get installation folder from registry if available
  InstallDirRegKey HKLM "Software\${PACKAGE_NAME}" ""

+  ;Request application privileges for Windows Vista
+  ;RequestExecutionLevel user
+  
 ;--------------------------------
 ;Versioninfo

@ -66,18 +70,15 @@ VIAddVersionKey "ProductVersion"	"${PACKAGE_VERSION}"
  !define MUI_HEADERIMAGE
  !define MUI_HEADERIMAGE_BITMAP "${TOP_SRCDIR}\icons\wz2100header.bmp"
  !define MUI_HEADERIMAGE_RIGHT
+  
+  !define MUI_WELCOMEFINISHPAGE_BITMAP "${TOP_SRCDIR}\icons\wz2100welcome.bmp"
+  !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${TOP_SRCDIR}\icons\wz2100welcome.bmp"

  !define MUI_ICON "${TOP_SRCDIR}\icons\warzone2100.ico"
  !define MUI_UNICON "${TOP_SRCDIR}\icons\warzone2100.uninstall.ico"

  !define MUI_ABORTWARNING

-  ; Settings for MUI_PAGE_LICENSE
-  ; Purposefully commented out, as we do _not_ want to trouble users with an
-  ; additional mouse click (while otherwise pressing "return" continuously
-  ; would satisfy)
-;  !define MUI_LICENSEPAGE_RADIOBUTTONS
-
  ;Start Menu Folder Page Configuration (for MUI_PAGE_STARTMENU)
  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${PACKAGE_NAME}"
@ -113,13 +114,7 @@ VIAddVersionKey "ProductVersion"	"${PACKAGE_VERSION}"
  !insertmacro MUI_LANGUAGE "English" # first language is the default language
  !insertmacro MUI_LANGUAGE "Dutch"
  !insertmacro MUI_LANGUAGE "German"
-
-;--------------------------------
-;License Language String
-
-  LicenseLangString MUILicense ${LANG_ENGLISH} "${TOP_SRCDIR}\COPYING"
-  LicenseLangString MUILicense ${LANG_DUTCH} "${TOP_SRCDIR}\COPYING"
-  LicenseLangString MUILicense ${LANG_GERMAN} "${TOP_SRCDIR}\COPYING"
+  !insertmacro MUI_LANGUAGE "Russian"

 ;--------------------------------
 ;Reserve Files
@ -152,12 +147,32 @@ Section $(TEXT_SecBase) SecBase
  File "${TOP_BUILDDIR}\data\mp.wz"
  File "${TOP_BUILDDIR}\data\base.wz"

-  ; Information/documentation files
-  File "/oname=ChangeLog.txt" "${TOP_SRCDIR}\ChangeLog"
-  File "/oname=Authors.txt" "${TOP_SRCDIR}\AUTHORS"
-  File "/oname=License.txt" "${TOP_SRCDIR}\COPYING"
-  File "/oname=Readme.en.txt" "${TOP_SRCDIR}\doc\Readme.en"
-  File "/oname=Readme.de.txt" "${TOP_SRCDIR}\doc\Readme.de"
+  ; Information/documentation files (convert eols for text files)
+  File "${TOP_SRCDIR}\ChangeLog"
+  Push "ChangeLog"
+  Push "ChangeLog.txt"
+  Call unix2dos
+	
+  File "${TOP_SRCDIR}\AUTHORS"
+  Push "AUTHORS"
+  Push "Authors.txt"
+  Call unix2dos
+
+  File "${TOP_SRCDIR}\COPYING"
+  Push "COPYING"
+  Push "License.txt"
+  Call unix2dos
+
+  File "${TOP_SRCDIR}\doc\Readme.en"
+  Push "Readme.en"
+  Push "Readme.en.txt"
+  Call unix2dos
+  
+  File "${TOP_SRCDIR}\doc\Readme.de"
+  Push "Readme.de"
+  Push "Readme.de.txt"
+  Call unix2dos
+  
  File "/oname=Readme.en.html" "${TOP_SRCDIR}\doc\Readme.en.xhtml"
  File "/oname=Readme.de.html" "${TOP_SRCDIR}\doc\Readme.de.xhtml"

@ -286,10 +301,11 @@ Section $(TEXT_SecOriginalMod) SecOriginalMod

 SectionEnd

-
 SectionGroupEnd

-Section $(TEXT_SecFMVs) SecFMVs
+SectionGroup $(TEXT_SecFMVs) SecFMVs
+
+Section /o $(TEXT_SecFMVs_Eng) SecFMVs_Eng

  IfFileExists "sequences.wz" +5
    NSISdl::download "http://www.il.fontys.nl/~giel/warzone/videos/warzone2100-sequences-en-hi-2.2-1.wz"               "sequences.wz"
@ -299,6 +315,28 @@ Section $(TEXT_SecFMVs) SecFMVs

 SectionEnd

+Section /o $(TEXT_SecFMVs_EngLo) SecFMVs_EngLo
+
+  IfFileExists "sequences.wz" +5
+    NSISdl::download "http://www.il.fontys.nl/~giel/warzone/videos/warzone2100-sequences-en-lo-2.2-1.wz"               "sequences.wz"
+    Pop $R0 ; Get the return value
+    StrCmp $R0 "success" +2
+      MessageBox MB_OK|MB_ICONSTOP "Download of videos failed: $R0"
+
+SectionEnd
+
+;Section /o $(TEXT_SecFMVs_Ger) SecFMVs_Ger
+;
+;  IfFileExists "sequences.wz" +5
+;    NSISdl::download "http://download.gna.org/warzone/videos/2.2/warzone2100-sequences-ger-hi-2.2.wz"               "sequences.wz"
+;    Pop $R0 ; Get the return value
+;    StrCmp $R0 "success" +2
+;      MessageBox MB_OK|MB_ICONSTOP "Download of videos failed: $R0"
+;
+;SectionEnd
+
+SectionGroupEnd
+
 SectionGroup $(TEXT_SecNLS) SecNLS

 Section "-NLS files" SecNLS_files
@ -393,24 +431,98 @@ SectionGroupEnd

 Function .onInit
  !insertmacro MUI_LANGDLL_DISPLAY
+  
+  # increase required size of section 'SecFMVs_Eng' by file size
+  SectionGetSize ${SecFMVs_Eng} $0
+  IntOp $0 $0 + 571937;134
+  SectionSetSize ${SecFMVs_Eng} $0
+
+  # increase required size of section 'SecFMVs_EngLo' by file size
+  SectionGetSize ${SecFMVs_EngLo} $0
+  IntOp $0 $0 + 165681;436
+  SectionSetSize ${SecFMVs_EngLo} $0
+
+  # increase required size of section 'SecFMVs_Ger' by file size
+;  SectionGetSize ${SecFMVs_Ger} $0
+;  IntOp $0 $0 + 499187;492
+;  SectionSetSize ${SecFMVs_Ger} $0
+  
+  ;HACK: Set section 'Video' as read-only
+  SectionGetFlags ${SecFMVs} $0
+  IntOp $0 $0 ^ ${SF_SELECTED}
+  IntOp $0 $0 | ${SF_RO}
+  SectionSetFlags ${SecFMVs} $0
+  
+  ;FIXME: Select default video sub-component
+  StrCpy $5 ${SecFMVs_Eng}
+FunctionEnd
+
+Function .onSelChange
+${If} ${SectionIsSelected} ${SecFMVs_Eng}
+${OrIf} ${SectionIsSelected} ${SecFMVs_EngLo}
+;${OrIf} ${SectionIsSelected} ${SecFMVs_Ger}
+	!insertmacro StartRadioButtons $5
+		!insertmacro RadioButton ${SecFMVs_Eng}
+		!insertmacro RadioButton ${SecFMVs_EngLo}
+;		!insertmacro RadioButton ${SecFMVs_Ger}
+	!insertmacro EndRadioButtons
+${EndIf}
 FunctionEnd

 Function LaunchLink
  Exec '$INSTDIR\${PACKAGE}.exe'
 FunctionEnd

+Function unix2dos
+    ; strips all CRs and then converts all LFs into CRLFs
+    ; (this is roughly equivalent to "cat file | dos2unix | unix2dos")
+    ; beware that this function destroys $0 $1 $2
+	;
+    ; usage:
+    ;    Push "infile"
+    ;    Push "outfile"
+    ;    Call unix2dos
+    ClearErrors
+    Pop $2
+    FileOpen $1 $2 w			;$1 = file output (opened for writing)
+    Pop $2
+    FileOpen $0 $2 r			;$0 = file input (opened for reading)
+    Push $2						;save name for deleting
+    IfErrors unix2dos_done
+
+unix2dos_loop:
+    FileReadByte $0 $2			; read a byte (stored in $2)
+    IfErrors unix2dos_done		; EOL 
+    StrCmp $2 13 unix2dos_loop	; skip CR
+    StrCmp $2 10 unix2dos_cr unix2dos_write	; if LF write an extra CR
+
+unix2dos_cr:
+    FileWriteByte $1 13
+
+unix2dos_write:
+    FileWriteByte $1 $2			; write byte
+    Goto unix2dos_loop			; read next byte
+
+unix2dos_done:
+    FileClose $0				; close files
+    FileClose $1
+    Pop $0
+    Delete $0					; delete original
+	
+FunctionEnd
+
 ;--------------------------------
 ;Descriptions

-  ;Language strings
-  LangString TEXT_SecBase ${LANG_ENGLISH} "Standard installation"
-  LangString DESC_SecBase ${LANG_ENGLISH} "Standard installation."
+  ;English
+  LangString TEXT_SecBase ${LANG_ENGLISH} "Core files"
+  LangString DESC_SecBase ${LANG_ENGLISH} "The core files required to run Warzone 2100."

  LangString TEXT_SecOpenAL ${LANG_ENGLISH} "OpenAL libraries"
  LangString DESC_SecOpenAL ${LANG_ENGLISH} "Runtime libraries for OpenAL, a free Audio interface. Implementation by Creative Labs."

  LangString TEXT_SecMods ${LANG_ENGLISH} "Mods"
-  LangString DESC_SecMods ${LANG_ENGLISH} "Various mods."
+  LangString DESC_SecMods ${LANG_ENGLISH} "Various mods for Warzone 2100."

  LangString TEXT_SecAivolutionMod ${LANG_ENGLISH} "Aivolution"
  LangString DESC_SecAivolutionMod ${LANG_ENGLISH} "Improved artificial intelligence that learns."
@ -419,23 +531,35 @@ FunctionEnd
 ;  LangString DESC_SecMusicMod ${LANG_ENGLISH} "Download and install music."

  LangString TEXT_SecFMVs ${LANG_ENGLISH} "Videos"
-  LangString DESC_SecFMVs ${LANG_ENGLISH} "Download and install Hi-quality videos (in-game cutscenes). 545 MB  A Low-quality version is available at http://wz2100.net/download and the German versions are available at http://warzone2100.de"
+  LangString DESC_SecFMVs ${LANG_ENGLISH} "Download and install in-game cutscenes."

-  LangString TEXT_SecNLS ${LANG_ENGLISH} "NLS"
+  LangString TEXT_SecFMVs_Eng ${LANG_ENGLISH} "English"
+  LangString DESC_SecFMVs_Eng ${LANG_ENGLISH} "Download and install English in-game cutscenes (545 MB)."
+  
+  LangString TEXT_SecFMVs_EngLo ${LANG_ENGLISH} "English (LQ)"
+  LangString DESC_SecFMVs_EngLo ${LANG_ENGLISH} "Download and install a low-quality version of English in-game cutscenes (162 MB)."
+  
+  LangString TEXT_SecFMVs_Ger ${LANG_ENGLISH} "German"
+  LangString DESC_SecFMVs_Ger ${LANG_ENGLISH} "Download and install German in-game cutscenes (460 MB)."
+  
+  LangString TEXT_SecNLS ${LANG_ENGLISH} "Language files"
  LangString DESC_SecNLS ${LANG_ENGLISH} "Support for languages other than English."

  LangString TEXT_SecNLS_WinFonts ${LANG_ENGLISH} "WinFonts"
  LangString DESC_SecNLS_WinFonts ${LANG_ENGLISH} "Include Windows Fonts folder into the search path. Enable this if you want to use custom fonts in config file or having troubles with standard font. Can be slow on Vista and later!"
  
-  LangString TEXT_SecNTWMod ${LANG_ENGLISH} "NTW: New Team War mod"
+  LangString TEXT_SecNTWMod ${LANG_ENGLISH} "NTW"
  LangString DESC_SecNTWMod ${LANG_ENGLISH} "NTW: New Team War mod. Modifies most of the weapons and research."

-  LangString TEXT_SecOriginalMod ${LANG_ENGLISH} "Original 1.10 balance"
-  LangString DESC_SecOriginalMod ${LANG_ENGLISH} "Play the game with the original 1.10 version balance stats."
+  LangString TEXT_SecOriginalMod ${LANG_ENGLISH} "1.10 balance"
+  LangString DESC_SecOriginalMod ${LANG_ENGLISH} "Play the game as it was back in the 1.10 days."

-
-  LangString TEXT_SecBase ${LANG_DUTCH} "Standaard installatie"
-  LangString DESC_SecBase ${LANG_DUTCH} "Standaard installatie."
+  LangString TEXT_RunWarzone ${LANG_ENGLISH} "Run ${PACKAGE_NAME}"
+  LangString TEXT_Readme ${LANG_ENGLISH} "$INSTDIR\Readme.en.html"
+  
+  ;Dutch
+  LangString TEXT_SecBase ${LANG_DUTCH} "Core files"
+  LangString DESC_SecBase ${LANG_DUTCH} "The core files required to run Warzone 2100."

  LangString TEXT_SecOpenAL ${LANG_DUTCH} "OpenAL bibliotheken"
  LangString DESC_SecOpenAL ${LANG_DUTCH} "Vereiste bibliotheken voor OpenAL, een opensource/vrije Audio Bibliotheek."
@ -449,24 +573,36 @@ FunctionEnd
 ;  LangString TEXT_SecMusicMod ${LANG_DUTCH} "Muziek"
 ;  LangString DESC_SecMusicMod ${LANG_DUTCH} "Muziek downloaden en installeren."

-  LangString TEXT_SecFMVs ${LANG_DUTCH} "FMV"
-  LangString DESC_SecFMVs ${LANG_DUTCH} "Download en installeer hoge kwaliteits videos (in-game cutscenes). 545 MiB  Een lage kwaliteits versie is beschikbaar op http://wz2100.net/download en de Duitse versies zijn beschikbaar op http://warzone2100.de"
+  LangString TEXT_SecFMVs ${LANG_DUTCH} "Videos"
+  LangString DESC_SecFMVs ${LANG_DUTCH} "Download and install in-game cutscenes."

-  LangString TEXT_SecNLS ${LANG_DUTCH} "NLS"
+  LangString TEXT_SecFMVs_Eng ${LANG_DUTCH} "English"
+  LangString DESC_SecFMVs_Eng ${LANG_DUTCH} "Download and install English in-game cutscenes (545 MB)."
+  
+  LangString TEXT_SecFMVs_EngLo ${LANG_DUTCH} "English (LQ)"
+  LangString DESC_SecFMVs_EngLo ${LANG_DUTCH} "Download and install a low-quality version of English in-game cutscenes (162 MB)."
+  
+  LangString TEXT_SecFMVs_Ger ${LANG_DUTCH} "German"
+  LangString DESC_SecFMVs_Ger ${LANG_DUTCH} "Download and install German in-game cutscenes (460 MB)."
+
+  LangString TEXT_SecNLS ${LANG_DUTCH} "Language files"
  LangString DESC_SecNLS ${LANG_DUTCH} "Ondersteuning voor andere talen dan Engels (Nederlands inbegrepen)."

  LangString TEXT_SecNLS_WinFonts ${LANG_DUTCH} "WinFonts"
  LangString DESC_SecNLS_WinFonts ${LANG_DUTCH} "Include Windows Fonts folder into the search path. Enable this if you want to use custom fonts in config file or having troubles with standard font. Can be slow on Vista and later!"
  
-  LangString TEXT_SecNTWMod ${LANG_DUTCH} "NTW: New Team War mod"
+  LangString TEXT_SecNTWMod ${LANG_DUTCH} "NTW"
  LangString DESC_SecNTWMod ${LANG_DUTCH} "NTW: New Team War mod. Wijzigd de meeste wapens en onderzoeken."

-  LangString TEXT_SecOriginalMod ${LANG_DUTCH} "Original 1.10 balance"
+  LangString TEXT_SecOriginalMod ${LANG_DUTCH} "1.10 balance"
  LangString DESC_SecOriginalMod ${LANG_DUTCH} "Speel het spel met de originele 1.10 versie balans stats."

-
-  LangString TEXT_SecBase ${LANG_GERMAN} "Standardinstallation"
-  LangString DESC_SecBase ${LANG_GERMAN} "Standardinstallation."
+  LangString TEXT_RunWarzone ${LANG_DUTCH} "Start ${PACKAGE_NAME}"
+  LangString TEXT_Readme ${LANG_DUTCH}   "$INSTDIR\Readme.en.html"
+  
+  ;German
+  LangString TEXT_SecBase ${LANG_GERMAN} "Core files"
+  LangString DESC_SecBase ${LANG_GERMAN} "Die Kerndateien, die für Warzone 2100 benötigt werden."

  LangString TEXT_SecOpenAL ${LANG_GERMAN} "OpenAL Bibliotheken"
  LangString DESC_SecOpenAL ${LANG_GERMAN} "Bibliotheken für OpenAL, ein freies Audio Interface. Implementation von Creative Labs."
@ -480,32 +616,76 @@ FunctionEnd
 ;  LangString TEXT_SecMusicMod ${LANG_GERMAN} "Musik"
 ;  LangString DESC_SecMusicMod ${LANG_GERMAN} "Musik herunterladen und installieren."

-  LangString TEXT_SecFMVs ${LANG_GERMAN} "FMV"
-  LangString DESC_SecFMVs ${LANG_GERMAN} "Englische Videosequenzen herunterladen und installieren (545 MiB). Die deutschen Videos gibt es auf http://warzone2100.de/, kleinere englische in schlechterer Qualität auf http://wz2100.net/download."
+  LangString TEXT_SecFMVs ${LANG_GERMAN} "Videos"
+  LangString DESC_SecFMVs ${LANG_GERMAN} "Videos herunterladen und installieren."

-  LangString TEXT_SecNLS ${LANG_GERMAN} "NLS"
+  LangString TEXT_SecFMVs_Eng ${LANG_GERMAN} "English"
+  LangString DESC_SecFMVs_Eng ${LANG_GERMAN} "Die englischen Videos herunterladen und installieren (545 MiB)."
+  
+  LangString TEXT_SecFMVs_EngLo ${LANG_GERMAN} "English (LQ)"
+  LangString DESC_SecFMVs_EngLo ${LANG_GERMAN} "Die englischen Videos in geringer Qualität herunterladen und installieren (162 MiB)."
+  
+  LangString TEXT_SecFMVs_Ger ${LANG_GERMAN} "German"
+  LangString DESC_SecFMVs_Ger ${LANG_GERMAN} "Die deutschen Videos herunterladen und installieren (460 MiB)."
+  
+  LangString TEXT_SecNLS ${LANG_GERMAN} "Language files"
  LangString DESC_SecNLS ${LANG_GERMAN} "Unterstützung für Sprachen außer Englisch (Deutsch inbegriffen)."

  LangString TEXT_SecNLS_WinFonts ${LANG_GERMAN} "WinFonts"
-  LangString DESC_SecNLS_WinFonts ${LANG_GERMAN} "Include Windows Fonts folder into the search path. Enable this if you want to use custom fonts in config file or having troubles with standard font. Can be slow on Vista and later!"
+  LangString DESC_SecNLS_WinFonts ${LANG_GERMAN} "Den Windows-Schriftarten-Ordner in den Suchpfad aufnehmen. Nutzen Sie dies, falls Sie später eigene Schriftarten in der Konfigurationsdatei eingeben wollen oder es zu Problemen mit der Standardschriftart kommt. Kann unter Vista und später langsam sein!"
  
-  LangString TEXT_SecNTWMod ${LANG_GERMAN} "NTW: New Team War mod"
+  LangString TEXT_SecNTWMod ${LANG_GERMAN} "NTW"
  LangString DESC_SecNTWMod ${LANG_GERMAN} "NTW: New Team War mod. Verändert die meisten Forschungen und Waffen."

-  LangString TEXT_SecOriginalMod ${LANG_GERMAN} "Original 1.10 balance"
+  LangString TEXT_SecOriginalMod ${LANG_GERMAN} "1.10 balance"
  LangString DESC_SecOriginalMod ${LANG_GERMAN} "Spielen Sie das Spiel mit dem Balancing aus der Originalversion 1.10."

-
-  LangString TEXT_RunWarzone ${LANG_ENGLISH} "Run ${PACKAGE_NAME}"
-  LangString TEXT_RunWarzone ${LANG_DUTCH} "Start ${PACKAGE_NAME}"
  LangString TEXT_RunWarzone ${LANG_GERMAN} "Starte ${PACKAGE_NAME}"
-
-
-  LangString TEXT_Readme ${LANG_ENGLISH} "$INSTDIR\Readme.en.html"
-  LangString TEXT_Readme ${LANG_DUTCH}   "$INSTDIR\Readme.en.html"
  LangString TEXT_Readme ${LANG_GERMAN}  "$INSTDIR\Readme.de.html"

+  ;Russian
+  LangString TEXT_SecBase ${LANG_RUSSIAN} "Áàçîâûå ôàéëû"
+  LangString DESC_SecBase ${LANG_RUSSIAN} "Ôàéëû òðåáóåìûå äëÿ çàïóñêà Warzone 2100."

+  LangString TEXT_SecOpenAL ${LANG_RUSSIAN} "Áèáëèîòåêà OpenAL"
+  LangString DESC_SecOpenAL ${LANG_RUSSIAN} "Ñâîáîäíî ðàñïðîñòðàíÿåìûé àïïàðàòíî- ïðîãðàììíûé èíòåðôåéñ (API) äëÿ ðàáîòû ñ àóäèîäàííûìè. Âåðñèÿ îò Creative Labs."
+
+  LangString TEXT_SecMods ${LANG_RUSSIAN} "Ìîäèôèêàöèè"
+  LangString DESC_SecMods ${LANG_RUSSIAN} "Ðàçëè÷íûå ìîäèôèêàöèè äëÿ Warzone 2100."
+
+  LangString TEXT_SecAivolutionMod ${LANG_RUSSIAN} "Aivolution"
+  LangString DESC_SecAivolutionMod ${LANG_RUSSIAN} "Óñîâåðøåíñòâîâàííûé èñêóññòâåííûé èíòåëëåêò, ñïîñîáíûé ê îáó÷åíèþ."
+
+;  LangString TEXT_SecMusicMod ${LANG_RUSSIAN} "Ìóçûêà"
+;  LangString DESC_SecMusicMod ${LANG_RUSSIAN} "Ñêà÷àòü è óñòàíîâèòü ìóçûêó."
+
+  LangString TEXT_SecFMVs ${LANG_RUSSIAN} "Âèäåî"
+  LangString DESC_SecFMVs ${LANG_RUSSIAN} "Ñêà÷àòü è óñòàíîâèòü âíóòðèèãðîâûå ðîëèêè."
+
+  LangString TEXT_SecFMVs_Eng ${LANG_RUSSIAN} "Àíãëèéñêèå"
+  LangString DESC_SecFMVs_Eng ${LANG_RUSSIAN} "Ñêà÷àòü è óñòàíîâèòü âíóòðèèãðîâûå ðîëèêè íà àíãëèéñêîì ÿçûêå (545 MB)."
+  
+  LangString TEXT_SecFMVs_EngLo ${LANG_RUSSIAN} "Àíãëèéñêèå (LQ)"
+  LangString DESC_SecFMVs_EngLo ${LANG_RUSSIAN} "Ñêà÷àòü è óñòàíîâèòü âíóòðèèãðîâûå ðîëèêè (íèçêîãî êà÷åñòâà) íà àíãëèéñêîì ÿçûêå (162 MB)."
+  
+  LangString TEXT_SecFMVs_Ger ${LANG_RUSSIAN} "Íåìåöêèå"
+  LangString DESC_SecFMVs_Ger ${LANG_RUSSIAN} "Ñêà÷àòü è óñòàíîâèòü âíóòðèèãðîâûå ðîëèêè íà íåìåöêîì ÿçûêå (460 MB)."
+  
+  LangString TEXT_SecNLS ${LANG_RUSSIAN} "ßçûêîâûå ôàéëû"
+  LangString DESC_SecNLS ${LANG_RUSSIAN} "Ïîääåðæêà Ðóññêîãî è äðóãèõ ÿçûêîâ."
+
+  LangString TEXT_SecNLS_WinFonts ${LANG_RUSSIAN} "WinØðèôòû"
+  LangString DESC_SecNLS_WinFonts ${LANG_RUSSIAN} "Çàäåéñòâîâàòü ïàïêó øðèôòîâ Windows ïðè ïîèñêå. Ïîìîãàåò åñëè åñòü ïðîáëåìû ñ ïîñòàâëÿåìûìè øðèôòàìè. Íà Âèñòå âîçìîæíî çàìåäëåíèå ïðè çàãðóçêå!"
+
+  LangString TEXT_SecNTWMod ${LANG_RUSSIAN} "NTW"
+  LangString DESC_SecNTWMod ${LANG_RUSSIAN} "Ìîäèôèêàöèÿ New Team War. Èçìåíÿåò áîëüøóþ ÷àñòü îðóæèÿ è èññëåäîâàíèé."
+
+  LangString TEXT_SecOriginalMod ${LANG_RUSSIAN} "Áàëàíñ 1.10"
+  LangString DESC_SecOriginalMod ${LANG_RUSSIAN} "Èãðàòü â èãðó ñ áàëàíñîì îò îðèãèíàëüíîé âåðñèè 1.10."
+
+  LangString TEXT_RunWarzone ${LANG_RUSSIAN} "Çàïóñê ${PACKAGE_NAME}"
+  LangString TEXT_Readme ${LANG_RUSSIAN} "$INSTDIR\Readme.en.html"
+  
  ;Assign language strings to sections
  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
    !insertmacro MUI_DESCRIPTION_TEXT ${SecBase} $(DESC_SecBase)
@ -515,16 +695,18 @@ FunctionEnd
    !insertmacro MUI_DESCRIPTION_TEXT ${SecMods} $(DESC_SecMods)
    !insertmacro MUI_DESCRIPTION_TEXT ${SecAivolutionMod} $(DESC_SecAivolutionMod)
 ;    !insertmacro MUI_DESCRIPTION_TEXT ${SecMusicMod} $(DESC_SecMusicMod)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecFMVs} $(DESC_SecFMVs)
    !insertmacro MUI_DESCRIPTION_TEXT ${SecNTWMod} $(DESC_SecNTWMod)
    !insertmacro MUI_DESCRIPTION_TEXT ${SecOriginalMod} $(DESC_SecOriginalMod)
+	
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecFMVs} $(DESC_SecFMVs)
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecFMVs_Eng} $(DESC_SecFMVs_Eng)
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecFMVs_EngLo} $(DESC_SecFMVs_EngLo)
+;	!insertmacro MUI_DESCRIPTION_TEXT ${SecFMVs_Ger} $(DESC_SecFMVs_Ger)

    !insertmacro MUI_DESCRIPTION_TEXT ${SecNLS} $(DESC_SecNLS)
    !insertmacro MUI_DESCRIPTION_TEXT ${SecNLS_WinFonts} $(DESC_SecNLS_WinFonts)
  !insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-
+  
 ;--------------------------------
 ;Uninstaller Section

@ -580,7 +762,7 @@ Section "Uninstall"

  Delete "$INSTDIR\mods\multiplay\ntw.wz"
  Delete "$INSTDIR\mods\multiplay\aivolution.wz"
-  Delete "$INSTDIR\mods\multiplay\original.wz"
+  Delete "$INSTDIR\mods\multiplay\old-1.10-balance.wz"

  RMDir "$INSTDIR\mods\multiplay"
  RMDir "$INSTDIR\mods\music"
@ -707,7 +889,7 @@ Section "Uninstall"
  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME}.lnk"
  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME} - Aivolution.lnk"
  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME} - NTW.lnk"
-  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME} - Original.lnk"
+  Delete "$SMPROGRAMS\$MUI_TEMP\${PACKAGE_NAME} - Old 1.10 Balance.lnk"
 ;  RMDir "$SMPROGRAMS\$STARTMENU_FOLDER"

  ;Delete empty start menu parent diretories
--- a/src/makefile.win32
+++ b/src/makefile.win32
@ -9,7 +9,8 @@ PARSERS= \
 	message_parser.tab.c \
 	message_lexer.lex.c \
 	scriptvals_parser.tab.c \
-	scriptvals_lexer.lex.c
+	scriptvals_lexer.lex.c \
+	level_lexer.lex.c

 SRC= \
 	$(PARSERS) \
@ -62,7 +63,6 @@ SRC= \
 	keybind.c \
 	keyedit.c \
 	keymap.c \
-	level_lexer.lex.c \
 	levels.c \
 	lighting.c \
 	loadsave.c \
@ -96,6 +96,7 @@ SRC= \
 	power.c \
 	projectile.c \
 	radar.c \
+	random.cpp \
 	raycast.c \
 	research.c \
 	scores.c \
@ -140,6 +141,6 @@ endif

 EXE=warzone2100

-CLEANFILES=message_parser.tab.h scriptvals_parser.tab.h
+CLEANFILES=message_parser.tab.h scriptvals_parser.tab.h $(PARSERS)

 include $(top_srcdir)/makerules/exe.mk