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

Initial comm alternate AlienSong architecture; alternate Utwig track for post-Ultron case

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1719 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-05-06 10:30:50 +00:00
parent ed1b15cae6
commit 8d638f589c
29 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm.c
+9 -1
View File
@@ -1966,6 +1966,7 @@ HailAlien (void)
MEM_HANDLE hOldIndex;
ENCOUNTER_STATE ES;
FONT PlayerFont, OldFont;
MUSIC_REF SongRef = 0;
pCurInputState = &ES;
memset (pCurInputState, 0, sizeof (*pCurInputState));
@@ -1984,7 +1985,14 @@ HailAlien (void)
CommData.AlienColorMap = CaptureColorMap (
LoadColorMapInstance ((RESOURCE)CommData.AlienColorMap)
);
CommData.AlienSong = LoadMusicInstance ((RESOURCE)CommData.AlienSong);
if ((CommData.AlienSongFlags & LDASF_USE_ALTERNATE)
&& CommData.AlienAltSong)
SongRef = LoadMusicFile (CommData.AlienAltSong);
if (SongRef)
CommData.AlienSong = SongRef;
else
CommData.AlienSong = LoadMusicInstance ((RESOURCE)CommData.AlienSong);
CommData.ConversationPhrases = CaptureStringTable (
LoadStringTableInstance ((RESOURCE)CommData.ConversationPhrases)
);
sc2/src/sc2code/comm/arilou/arilouc.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA arilou_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
ARILOU_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
ARILOU_CONVERSATION_PHRASES, /* PlayerPhrases */
20, /* NumAnimations */
{
sc2/src/sc2code/comm/blackur/blackurc.c
+2
View File
@@ -32,6 +32,8 @@ static LOCDATA blackurq_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
BLACKURQ_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
BLACKURQ_CONVERSATION_PHRASES, /* PlayerPhrases */
8, /* NumAnimations */
{
sc2/src/sc2code/comm/chmmr/chmmrc.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA chmmr_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
(COLORMAP)CHMMR_COLOR_MAP, /* AlienColorMap */
CHMMR_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
CHMMR_CONVERSATION_PHRASES, /* PlayerPhrases */
6, /* NumAnimations */
{
sc2/src/sc2code/comm/comandr/comandr.c
+2
View File
@@ -34,6 +34,8 @@ static LOCDATA commander_desc =
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
COMMANDER_COLOR_MAP, /* AlienColorMap */
COMMANDER_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
COMMANDER_CONVERSATION_PHRASES, /* PlayerPhrases */
3, /* NumAnimations */
{
sc2/src/sc2code/comm/druuge/druugec.c
+2
View File
@@ -36,6 +36,8 @@ static LOCDATA druuge_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
DRUUGE_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
DRUUGE_CONVERSATION_PHRASES, /* PlayerPhrases */
11,
{
sc2/src/sc2code/comm/ilwrath/ilwrathc.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA ilwrath_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
ILWRATH_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
ILWRATH_CONVERSATION_PHRASES, /* PlayerPhrases */
4, /* NumAnimations */
{
sc2/src/sc2code/comm/melnorm/melnorm.c
+2
View File
@@ -51,6 +51,8 @@ static LOCDATA melnorme_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
MELNORME_COLOR_MAP, /* AlienColorMap */
MELNORME_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
MELNORME_CONVERSATION_PHRASES, /* PlayerPhrases */
4, /* NumAnimations */
{
sc2/src/sc2code/comm/mycon/myconc.c
+2
View File
@@ -36,6 +36,8 @@ static LOCDATA mycon_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
MYCON_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
MYCON_CONVERSATION_PHRASES, /* PlayerPhrases */
5, /* NumAnimations */
{
sc2/src/sc2code/comm/orz/orzc.c
+2
View File
@@ -34,6 +34,8 @@ static LOCDATA orz_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
(COLORMAP)ORZ_COLOR_MAP, /* AlienColorMap */
ORZ_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
ORZ_CONVERSATION_PHRASES, /* PlayerPhrases */
12 /* 13 */, /* NumAnimations */
{
sc2/src/sc2code/comm/pkunk/pkunkc.c
+2
View File
@@ -36,6 +36,8 @@ static LOCDATA pkunk_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
PKUNK_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
PKUNK_CONVERSATION_PHRASES, /* PlayerPhrases */
3, /* NumAnimations */
{
sc2/src/sc2code/comm/rebel/rebel.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA yehat_desc =
0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */
0, /* AlienColorMap */
YEHAT_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
REBEL_CONVERSATION_PHRASES, /* PlayerPhrases */
15, /* NumAnimations */
{
sc2/src/sc2code/comm/shofixt/shofixt.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA shofixti_desc =
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
0, /* AlienColorMap */
SHOFIXTI_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
SHOFIXTI_CONVERSATION_PHRASES, /* PlayerPhrases */
11, /* NumAnimations */
{
sc2/src/sc2code/comm/slyhome/slyhome.c
+2
View File
@@ -34,6 +34,8 @@ static LOCDATA slylandro_desc =
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
(COLORMAP)SLYLANDRO_COLOR_MAP, /* AlienColorMap */
SLYLANDRO_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
SLYLANDRO_CONVERSATION_PHRASES, /* PlayerPhrases */
13, /* NumAnimations */
{
sc2/src/sc2code/comm/slyland/slyland.c
+2
View File
@@ -36,6 +36,8 @@ static LOCDATA slylandro_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
SLYLAND_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
SLYLAND_CONVERSATION_PHRASES, /* PlayerPhrases */
6, /* NumAnimations */
{
sc2/src/sc2code/comm/spahome/spahome.c
+2
View File
@@ -36,6 +36,8 @@ static LOCDATA spahome_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
(COLORMAP)SPATHI_HOME_COLOR_MAP, /* AlienColorMap */
SPATHI_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
SPATHI_HOME_CONVERSATION_PHRASES, /* PlayerPhrases */
14, /* NumAnimations */
{
sc2/src/sc2code/comm/spathi/spathic.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA spathi_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
SPATHI_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
SPATHI_CONVERSATION_PHRASES, /* PlayerPhrases */
8, /* NumAnimations */
{
sc2/src/sc2code/comm/starbas/starbas.c
+2
View File
@@ -52,6 +52,8 @@ static LOCDATA commander_desc =
0, /* SIS_TEXT_WIDTH, */ /* AlienTextWidth */
(COLORMAP)COMMANDER_COLOR_MAP, /* AlienColorMap */
COMMANDER_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
STARBASE_CONVERSATION_PHRASES, /* PlayerPhrases */
10, /* NumAnimations */
{
sc2/src/sc2code/comm/supox/supoxc.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA supox_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
SUPOX_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
SUPOX_CONVERSATION_PHRASES, /* PlayerPhrases */
4, /* NumAnimations */
{
sc2/src/sc2code/comm/syreen/syreenc.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA syreen_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
(COLORMAP)SYREEN_COLOR_MAP, /* AlienColorMap */
SYREEN_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
SYREEN_CONVERSATION_PHRASES, /* PlayerPhrases */
15, /* NumAnimations */
{
sc2/src/sc2code/comm/talkpet/talkpet.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA talkpet_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
(COLORMAP)TALKING_PET_COLOR_MAP, /* AlienColorMap */
TALKING_PET_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
TALKING_PET_CONVERSATION_PHRASES, /* PlayerPhrases */
16, /* NumAnimations */
{
sc2/src/sc2code/comm/thradd/thraddc.c
+2
View File
@@ -36,6 +36,8 @@ static LOCDATA thradd_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
THRADD_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
THRADD_CONVERSATION_PHRASES, /* PlayerPhrases */
8, /* NumAnimations */
{
sc2/src/sc2code/comm/umgah/umgahc.c
+2
View File
@@ -35,6 +35,8 @@ static LOCDATA umgah_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
UMGAH_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
UMGAH_CONVERSATION_PHRASES, /* PlayerPhrases */
16, /* NumAnimations */
{
sc2/src/sc2code/comm/urquan/urquanc.c
+2
View File
@@ -32,6 +32,8 @@ static LOCDATA urquan_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
URQUAN_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
URQUAN_CONVERSATION_PHRASES, /* PlayerPhrases */
7, /* NumAnimations */
{
sc2/src/sc2code/comm/utwig/utwigc.c
+12
View File
@@ -36,6 +36,8 @@ static LOCDATA utwig_desc =
0, /* SIS_TEXT_WIDTH - 16, */ /* AlienTextWidth */
0, /* AlienColorMap */
UTWIG_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
UTWIG_CONVERSATION_PHRASES, /* PlayerPhrases */
16, /* NumAnimations */
{
@@ -962,6 +964,16 @@ init_utwig_comm (void)
utwig_desc.AlienTextTemplate.valign = VALIGN_MIDDLE;
utwig_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
if (GET_GAME_STATE (UTWIG_HAVE_ULTRON))
{ // use alternate 'Happy Utwig!' track
utwig_desc.AlienAltSong = "comm/utwig/utwigult.ogg";
utwig_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
}
else
{ // regular track -- let's make sure
utwig_desc.AlienSongFlags &= ~LDASF_USE_ALTERNATE;
}
if (GET_GAME_STATE (UTWIG_HAVE_ULTRON)
|| LOBYTE (GLOBAL (CurrentActivity)) == WON_LAST_BATTLE)
{
sc2/src/sc2code/comm/vux/vuxc.c
+2
View File
@@ -32,6 +32,8 @@ static LOCDATA vux_desc =
0, /* (SIS_TEXT_WIDTH - 16) >> 1, */ /* AlienTextWidth */
VUX_COLOR_MAP, /* AlienColorMap */
VUX_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
VUX_CONVERSATION_PHRASES, /* PlayerPhrases */
17, /* NumAnimations */
{
sc2/src/sc2code/comm/yehat/yehatc.c
+2
View File
@@ -37,6 +37,8 @@ static LOCDATA yehat_desc =
0, /* (SIS_TEXT_WIDTH - 16) * 2 / 3, */ /* AlienTextWidth */
0, /* AlienColorMap */
YEHAT_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
YEHAT_CONVERSATION_PHRASES, /* PlayerPhrases */
15, /* NumAnimations */
{
sc2/src/sc2code/comm/zoqfot/zoqfotc.c
+2
View File
@@ -52,6 +52,8 @@ static LOCDATA zoqfot_desc =
0, /* SIS_SCREEN_WIDTH, */ /* AlienTextWidth */
0, /* AlienColorMap */
ZOQFOTPIK_MUSIC, /* AlienSong */
0, /* AlienAltSong */
0, /* AlienSongFlags */
ZOQFOTPIK_CONVERSATION_PHRASES, /* PlayerPhrases */
3, /* NumAnimations */
{
sc2/src/sc2code/globdata.h
+6
View File
@@ -111,6 +111,10 @@ typedef NUMBER_SPEECH_DESC *PNUMBER_SPEECH_DESC;
#define NUMBER_SPEECH_DESCPTR PNUMBER_SPEECH_DESC
typedef NUMBER_SPEECH_DESC *NUMBER_SPEECH;
typedef DWORD LDAS_FLAGS;
#define LDASF_NONE ((LDAS_FLAGS) 0 )
#define LDASF_USE_ALTERNATE ((LDAS_FLAGS)(1 << 0))
typedef struct
{
void (*init_encounter_func) (void);
@@ -126,6 +130,8 @@ typedef struct
COUNT AlienTextWidth;
COLORMAP AlienColorMap;
DWORD AlienSong;
PVOID AlienAltSong;
LDAS_FLAGS AlienSongFlags;
STRING ConversationPhrases;