adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added PC version outtakes (part of bug #46), from chmmravatar

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@967 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2003-05-21 01:49:33 +00:00
parent f22e83105b
commit e5191f22be
67 changed files with 343 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/msvc++/UrQuanMasters.dsp
+8
View File
@@ -2975,6 +2975,10 @@ SOURCE=..\sc2code\credits.c
# End Source File
# Begin Source File
SOURCE=..\sc2code\credits.h
# End Source File
# Begin Source File
SOURCE=..\sc2code\cyborg.c
# End Source File
# Begin Source File
@@ -3135,6 +3139,10 @@ SOURCE=..\sc2code\oscill.c
# End Source File
# Begin Source File
SOURCE=..\sc2code\oscill.h
# End Source File
# Begin Source File
SOURCE=..\sc2code\outfit.c
# End Source File
# Begin Source File
sc2/src/sc2code/comm/arilou/arilouc.c
+1 -1
View File
@@ -623,7 +623,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/arilou/strings.h
+1
View File
@@ -118,6 +118,7 @@ enum
APOLOGIZE_AT_HOMEWORLD,
bye_angry_space,
GOODBYE_ANGRY_SPACE,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/blackur/blackurc.c
+1 -1
View File
@@ -425,7 +425,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/blackur/strings.h
+1
View File
@@ -97,6 +97,7 @@ enum
bye,
GOODBYE_AND_DIE,
GAME_OVER_DUDE,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/druuge/druugec.c
+1 -1
View File
@@ -666,7 +666,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/druuge/strings.h
+1
View File
@@ -126,6 +126,7 @@ enum
FAIR_DEAL,
GOOD_DEAL,
FINE_DEAL,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/orz/orzc.c
+1 -1
View File
@@ -624,7 +624,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/orz/strings.h
+1
View File
@@ -137,6 +137,7 @@ enum
ANGRY_TAALO_GOODBYE,
HOSTILE_HELLO_1,
HOSTILE_HELLO_2,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/pkunk/pkunkc.c
+1 -1
View File
@@ -831,7 +831,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/pkunk/strings.h
+1
View File
@@ -205,6 +205,7 @@ enum
FORTUNE_IS_6,
FORTUNE_IS_7,
FORTUNE_IS_8,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/shofixt/shofixt.c
+1 -1
View File
@@ -531,7 +531,7 @@ Intro (void)
{
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/shofixt/strings.h
+1
View File
@@ -119,6 +119,7 @@ enum
report1,
NOTHING_NEW0,
NOTHING_NEW1,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/supox/strings.h
+1
View File
@@ -118,6 +118,7 @@ enum
name_3,
name_40,
name_41,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/supox/supoxc.c
+1 -1
View File
@@ -513,7 +513,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/syreen/strings.h
+1
View File
@@ -152,6 +152,7 @@ enum
THEN_STOP_TALKING,
LATER,
SEX_GOODBYE,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/syreen/syreenc.c
+1 -1
View File
@@ -701,7 +701,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/talkpet/strings.h
+1
View File
@@ -134,6 +134,7 @@ enum
OK_ENOUGH_INFO,
UMGAH_ALL_GONE,
HELLO_AFTER_COMPEL_URQUAN,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/talkpet/talkpet.c
+1 -1
View File
@@ -634,7 +634,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/thradd/strings.h
+1
View File
@@ -174,6 +174,7 @@ enum
HAVING_FUN_WITH_ILWRATH_2,
GO_AWAY_FIGHTING_ILWRATH_1,
GO_AWAY_FIGHTING_ILWRATH_2,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/thradd/thraddc.c
+1 -1
View File
@@ -672,7 +672,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/urquan/strings.h
+1
View File
@@ -95,6 +95,7 @@ enum
GENERAL_INFO_3,
whats_up_4,
GENERAL_INFO_4,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/urquan/urquanc.c
+1 -1
View File
@@ -396,7 +396,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/utwig/strings.h
+1
View File
@@ -138,6 +138,7 @@ enum
DONT_NEED,
HAVE_4_SHIPS,
NO_ULTRON_AT_BOMB,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/utwig/utwigc.c
+1 -1
View File
@@ -709,7 +709,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/vux/strings.h
+1
View File
@@ -123,6 +123,7 @@ enum
GOODBYE_AND_DIE_HOSTILE_SPACE_2,
GOODBYE_AND_DIE_HOSTILE_SPACE_3,
GOODBYE_AND_DIE_HOSTILE_SPACE_4,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/vux/vuxc.c
+1 -1
View File
@@ -669,7 +669,7 @@ Intro (void)
{
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/yehat/strings.h
+1
View File
@@ -96,6 +96,7 @@ enum
name_3,
name_40,
name_41,
OUT_TAKES,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/yehat/yehatc.c
+1 -1
View File
@@ -549,7 +549,7 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
// NPCPhrase (OUT_TAKES);
NPCPhrase (OUT_TAKES);
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
sc2/src/sc2code/comm/zoqfot/strings.h
+14
View File
@@ -345,6 +345,20 @@ enum
name_3,
name_40,
name_41,
OUT_TAKES0,
OUT_TAKES1,
OUT_TAKES2,
OUT_TAKES3,
OUT_TAKES4,
OUT_TAKES5,
OUT_TAKES6,
OUT_TAKES7,
OUT_TAKES8,
OUT_TAKES9,
OUT_TAKES10,
OUT_TAKES11,
OUT_TAKES12,
OUT_TAKES13,
};
#endif /* _STRINGS_H */
sc2/src/sc2code/comm/zoqfot/zoqfotc.c
-16
View File
@@ -740,7 +740,6 @@ Intro (void)
if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
#ifdef NOT_YET
NPCPhrase_cb (OUT_TAKES0, &SelectAlienZOQ);
NPCPhrase_cb (OUT_TAKES1, &SelectAlienPIK);
NPCPhrase_cb (OUT_TAKES2, &SelectAlienZOQ);
@@ -756,21 +755,6 @@ Intro (void)
NPCPhrase_cb (OUT_TAKES12, &SelectAlienZOQ);
NPCPhrase_cb (OUT_TAKES13, &SelectAlienPIK);
ZFPTalkSegue ((COUNT)~0);
#else /* YET */
NPCPhrase_cb (WE_ARE0, &SelectAlienZOQ);
NPCPhrase_cb (WE_ARE1, &SelectAlienPIK);
NPCPhrase_cb (WE_ARE2, &SelectAlienZOQ);
NPCPhrase_cb (WE_ARE3, &SelectAlienPIK);
NPCPhrase_cb (WE_ARE4, &SelectAlienZOQ);
NPCPhrase_cb (WE_ARE5, &SelectAlienPIK);
NPCPhrase_cb (WE_ARE6, &SelectAlienZOQ);
NPCPhrase_cb (WE_ARE7, &SelectAlienPIK);
NPCPhrase_cb (SCOUT_HELLO0, &SelectAlienZOQ);
NPCPhrase_cb (SCOUT_HELLO1, &SelectAlienPIK);
NPCPhrase_cb (SCOUT_HELLO2, &SelectAlienZOQ);
NPCPhrase_cb (SCOUT_HELLO3, &SelectAlienPIK);
ZFPTalkSegue ((COUNT)~0);
#endif /* NOT_YET */
SET_GAME_STATE (BATTLE_SEGUE, 0);
goto ExitIntro;
}
sc2/src/sc2code/credits.c
+38
View File
@@ -18,6 +18,8 @@
#include "starcon.h"
#include "libs/graphics/gfx_common.h"
#include "libs/sound/sound_common.h"
#include "oscill.h"
//Added by Chris
@@ -115,4 +117,40 @@ FreeHyperData ();
}
}
void
OutTakes (void)
{
RECT r;
float oldvolume = speechVolumeScale;
speechVolumeScale = 0.0f;
sliderDisabled = TRUE;
SetSemaphore (GraphicsSem);
SetContext (ScreenContext);
SetContextForeGroundColor (BUILD_COLOR (MAKE_RGB15 (0x0, 0x0, 0x0), 0x00));
r.corner.x = r.corner.y = 0;
r.extent.width = SCREEN_WIDTH;
r.extent.height = SCREEN_HEIGHT;
DrawFilledRectangle (&r);
ClearSemaphore (GraphicsSem);
InitCommunication (ZOQFOTPIK_CONVERSATION);
InitCommunication (TALKING_PET_CONVERSATION);
InitCommunication (ORZ_CONVERSATION);
InitCommunication (UTWIG_CONVERSATION);
InitCommunication (THRADD_CONVERSATION);
InitCommunication (SUPOX_CONVERSATION);
InitCommunication (SYREEN_CONVERSATION);
InitCommunication (SHOFIXTI_CONVERSATION);
InitCommunication (PKUNK_CONVERSATION);
InitCommunication (YEHAT_CONVERSATION);
InitCommunication (DRUUGE_CONVERSATION);
InitCommunication (URQUAN_CONVERSATION);
InitCommunication (VUX_CONVERSATION);
InitCommunication (BLACKURQ_CONVERSATION);
InitCommunication (ARILOU_CONVERSATION);
speechVolumeScale = oldvolume;
sliderDisabled = FALSE;
}
sc2/src/sc2code/credits.h
+17
View File
@@ -0,0 +1,17 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
void OutTakes (void);
sc2/src/sc2code/oscill.c
+4
View File
@@ -92,6 +92,7 @@ static STAMP sliderStamp;
static STAMP buttonStamp;
static BOOLEAN sliderChanged = FALSE;
int sliderSpace; // slider width - button width
BOOLEAN sliderDisabled = FALSE;
/*
* Initialise the communication progress bar
@@ -128,6 +129,9 @@ Slider (void)
{
int offs;
static int last_offs = -1;
if (sliderDisabled)
return;
if ((offs = GetSoundInfo (sliderSpace)) != last_offs ||sliderChanged)
{
sc2/src/sc2code/oscill.h
+17
View File
@@ -0,0 +1,17 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
extern BOOLEAN sliderDisabled;
sc2/src/sc2code/starcon.c
+3
View File
@@ -17,6 +17,7 @@
*/
#include "starcon.h"
#include "credits.h"
//Added by Chris
@@ -989,6 +990,8 @@ sc = _simple_count;
if (GET_GAME_STATE (KOHR_AH_KILLED_ALL))
InitCommunication (BLACKURQ_CONVERSATION);
//surrendered to Ur-Quan
else if (LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
OutTakes ();
else if (GLOBAL (CurrentActivity) & CHECK_RESTART)
GLOBAL (CurrentActivity) &= ~CHECK_RESTART;
break;