From 883cae94532aad800827cf34746d615ad1eccc4f Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 28 Oct 2011 15:28:54 +0000
Subject: allow singing duet with 3 or 6 players, update to r9.22
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2833 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
Game/Code/Screens/UScreenSong.pas | 3 +--
Game/Code/UltraStar.cfg | 12 ++++++------
Game/Code/UltraStar.dpr | 2 +-
Installer/settings/variables.nsh | 2 +-
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 0483284e..653b37c1 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -756,8 +756,7 @@ begin
end else
begin // clicked on song
- if (CatSongs.Song[Interaction].isDuet and ((PlayersPlay=1) or
- (PlayersPlay=3) or (PlayersPlay=6))) then
+ if (CatSongs.Song[Interaction].isDuet and (PlayersPlay=1)) then
begin
ScreenPopupError.ShowPopup(Language.Translate('SING_ERROR_DUET_NUM_PLAYERS'));
Exit;
diff --git a/Game/Code/UltraStar.cfg b/Game/Code/UltraStar.cfg
index bc7a1509..fd156192 100644
--- a/Game/Code/UltraStar.cfg
+++ b/Game/Code/UltraStar.cfg
@@ -33,12 +33,12 @@
-K$00400000
-E"..\Output"
-N0"..\Units"
--LE"C:\Users\Alex\Documents\Borland Studio-Projekte\Bpl"
--LN"C:\Users\Alex\Documents\Borland Studio-Projekte\Bpl"
--U"c:\program files\borland\bds\4.0\lib\Debug;c:\program files\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
--O"c:\program files\borland\bds\4.0\lib\Debug;c:\program files\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
--I"c:\program files\borland\bds\4.0\lib\Debug;c:\program files\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
--R"c:\program files\borland\bds\4.0\lib\Debug;c:\program files\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
+-LE"C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\Borland Studio-Projekte\Bpl"
+-LN"C:\Dokumente und Einstellungen\Administrator\Eigene Dateien\Borland Studio-Projekte\Bpl"
+-U"c:\programme\borland\bds\4.0\lib\Debug;c:\programme\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
+-O"c:\programme\borland\bds\4.0\lib\Debug;c:\programme\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
+-I"c:\programme\borland\bds\4.0\lib\Debug;c:\programme\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
+-R"c:\programme\borland\bds\4.0\lib\Debug;c:\programme\borland\bds\4.0\Lib\Debug\Indy10;lib\JEDI-SDLv1.0\SDL\Pas;lib\DSPack\DSPack;lib\DSPack\DirectX9"
-w-UNSAFE_TYPE
-w-UNSAFE_CODE
-w-UNSAFE_CAST
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index c5c93146..6506e152 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -123,7 +123,7 @@ uses
const
VersionName = 'UltraStar Deluxe Challenge, Medley & Duet Edition';
- VersionNumber = 'r9.21';
+ VersionNumber = 'r9.22';
var
WndTitle: string;
diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index d03e1b7d..3b5d0840 100644
--- a/Installer/settings/variables.nsh
+++ b/Installer/settings/variables.nsh
@@ -1,7 +1,7 @@
; These are the common used variables
; for the USdx Challenge, Medley & Duet Edition Installation Wizard
-!define version "r9.20" ; Current version of UltraStar Deluxe Challenge, Medley & Duet Edition
+!define version "r9.22" ; Current version of UltraStar Deluxe Challenge, Medley & Duet Edition
!define p_name "UltraStar Deluxe CMD Edition" ; Just the name of the program
!define publisher "USDX Team" ; Publisher
!define homepage "http://www.ultrastardeluxe.org/" ; Project Homepage
--
cgit v1.2.3