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

Syreen dialog fixes; reverted the changes to dialog code to original 3DO code (since the new voice-sync system can handle it just fine), so no more freezing during PLAYER_HAVING_SEX ;-)

Browse Source 
Some minor adjustments to subtitle texts.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@743 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-02-12 10:31:27 +00:00
parent 1117cdbb62
commit c8be892db3
4 changed files with 30 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm/syreen/strings.h
+6 -20
View File
@@ -129,35 +129,21 @@ enum
GOODBYE_BEFORE_AMBUSH,
what_about_us,
ABOUT_US,
MORE_COMFORTABLE0,
MORE_COMFORTABLE1,
MORE_COMFORTABLE,
in_the_spirit,
OK_SPIRIT0,
OK_SPIRIT1,
OK_SPIRIT2,
OK_SPIRIT3,
OK_SPIRIT,
what_in_mind,
SOMETHING_LIKE_THIS0,
SOMETHING_LIKE_THIS1,
SOMETHING_LIKE_THIS2,
SOMETHING_LIKE_THIS3,
SOMETHING_LIKE_THIS,
hands_off,
OK_WONT_USE_HANDS0,
OK_WONT_USE_HANDS1,
OK_WONT_USE_HANDS2,
OK_WONT_USE_HANDS3,
OK_WONT_USE_HANDS,
why_lights_off,
LIGHTS_OFF_BECAUSE0,
LIGHTS_OFF_BECAUSE1,
LIGHTS_OFF_BECAUSE2,
LIGHTS_OFF_BECAUSE3,
LIGHTS_OFF_BECAUSE,
evil_monster,
NOT_EVIL_MONSTER,
disease,
JUST_RELAX,
what_happens_if_i_touch_this,
THIS_HAPPENS0,
THIS_HAPPENS1,
THIS_HAPPENS,
are_you_sure_this_is_ok,
YES_SURE,
boy_they_never_taught,
sc2/src/sc2code/comm/syreen/syreenc.c
+6 -112
View File
@@ -189,34 +189,7 @@ FriendlyExit (RESPONSE_REF R)
else
{
if (PLAYER_SAID (R, hands_off))
{
NPCPhrase (OK_WONT_USE_HANDS0);
NPCPhrase (OK_WONT_USE_HANDS1);
NPCPhrase (OK_WONT_USE_HANDS2);
NPCPhrase (OK_WONT_USE_HANDS3);
syreen_desc.AlienTextTemplate.align = ALIGN_RIGHT;
syreen_desc.AlienTextTemplate.baseline.x = SIS_SCREEN_WIDTH - TEXT_X_OFFS;
AlienTalkSegue (1);
syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 3 / 4;
syreen_desc.AlienTextTemplate.baseline.y = 120 * 3 / 4;
AlienTalkSegue (2);
syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 2 / 4;
syreen_desc.AlienTextTemplate.baseline.y = 120 * 2 / 4;
AlienTalkSegue (3);
syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 1 / 4;
syreen_desc.AlienTextTemplate.baseline.y = 120 * 1 / 4;
AlienTalkSegue ((COUNT)~0);
syreen_desc.AlienTextTemplate.baseline.x =
TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1);
syreen_desc.AlienTextTemplate.baseline.y = 0;
syreen_desc.AlienTextTemplate.align = ALIGN_CENTER;
syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
}
NPCPhrase (OK_WONT_USE_HANDS);
else if (PLAYER_SAID (R, not_much_more_to_say))
NPCPhrase (THEN_STOP_TALKING);
NPCPhrase (LATER);
@@ -238,68 +211,14 @@ static void
Sex (RESPONSE_REF R)
{
if (PLAYER_SAID (R, in_the_spirit))
{
NPCPhrase (OK_SPIRIT0);
NPCPhrase (OK_SPIRIT1);
NPCPhrase (OK_SPIRIT2);
NPCPhrase (OK_SPIRIT3);
syreen_desc.AlienTextTemplate.align = ALIGN_LEFT;
syreen_desc.AlienTextTemplate.baseline.x = TEXT_X_OFFS;
AlienTalkSegue (1);
syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 1 / 4;
syreen_desc.AlienTextTemplate.baseline.y = 120 * 1 / 4;
AlienTalkSegue (2);
syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 2 / 4;
syreen_desc.AlienTextTemplate.baseline.y = 120 * 2 / 4;
AlienTalkSegue (3);
syreen_desc.AlienTextTemplate.baseline.x = SIS_TEXT_WIDTH * 3 / 4;
syreen_desc.AlienTextTemplate.baseline.y = 120 * 3 / 4;
AlienTalkSegue ((COUNT)~0);
syreen_desc.AlienTextTemplate.baseline.x =
TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1);
syreen_desc.AlienTextTemplate.baseline.y = 0;
syreen_desc.AlienTextTemplate.align = ALIGN_CENTER;
syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
}
NPCPhrase (OK_SPIRIT);
else if (PLAYER_SAID (R, what_in_mind))
{
NPCPhrase (SOMETHING_LIKE_THIS0);
NPCPhrase (SOMETHING_LIKE_THIS1);
NPCPhrase (SOMETHING_LIKE_THIS2);
NPCPhrase (SOMETHING_LIKE_THIS3);
syreen_desc.AlienTextTemplate.align = ALIGN_LEFT;
syreen_desc.AlienTextTemplate.baseline.x = TEXT_X_OFFS;
AlienTalkSegue (1);
syreen_desc.AlienTextTemplate.baseline.y = 120 * 3 / 4;
AlienTalkSegue (2);
syreen_desc.AlienTextTemplate.align = ALIGN_RIGHT;
syreen_desc.AlienTextTemplate.baseline.x = SIS_SCREEN_WIDTH - TEXT_X_OFFS;
AlienTalkSegue (3);
syreen_desc.AlienTextTemplate.baseline.y = 0;
AlienTalkSegue ((COUNT)~0);
syreen_desc.AlienTextTemplate.baseline.x =
TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1);
syreen_desc.AlienTextTemplate.baseline.y = 0;
syreen_desc.AlienTextTemplate.align = ALIGN_CENTER;
syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
}
NPCPhrase (SOMETHING_LIKE_THIS);
else if (PLAYER_SAID (R, disease))
NPCPhrase (JUST_RELAX);
else if (PLAYER_SAID (R, what_happens_if_i_touch_this))
{
NPCPhrase (THIS_HAPPENS0);
NPCPhrase (GLOBAL_PLAYER_NAME);
NPCPhrase (THIS_HAPPENS1);
NPCPhrase (THIS_HAPPENS);
DISABLE_PHRASE (what_happens_if_i_touch_this);
}
@@ -341,9 +260,7 @@ Foreplay (RESPONSE_REF R)
NPCPhrase (HERES_REWARD);
else
NPCPhrase (ABOUT_US);
NPCPhrase (MORE_COMFORTABLE0);
NPCPhrase (GLOBAL_PLAYER_NAME);
NPCPhrase (MORE_COMFORTABLE1);
NPCPhrase (MORE_COMFORTABLE);
AlienTalkSegue (1);
XFormPLUT (GetColorMapAddress (
SetAbsColorMapIndex (CommData.AlienColorMap, 1)
@@ -354,30 +271,7 @@ Foreplay (RESPONSE_REF R)
}
else if (PLAYER_SAID (R, why_lights_off))
{
NPCPhrase (LIGHTS_OFF_BECAUSE0);
NPCPhrase (LIGHTS_OFF_BECAUSE1);
NPCPhrase (LIGHTS_OFF_BECAUSE2);
NPCPhrase (LIGHTS_OFF_BECAUSE3);
AlienTalkSegue (1);
syreen_desc.AlienTextWidth >>= 1;
syreen_desc.AlienTextTemplate.baseline.x =
TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 2);
syreen_desc.AlienTextTemplate.baseline.y = 50;
AlienTalkSegue (2);
syreen_desc.AlienTextTemplate.baseline.x =
(TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1))
+ (SIS_TEXT_WIDTH >> 2);
AlienTalkSegue (3);
syreen_desc.AlienTextTemplate.baseline.x =
TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1);
syreen_desc.AlienTextTemplate.baseline.y = 90;
syreen_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
AlienTalkSegue ((COUNT)~0);
syreen_desc.AlienTextTemplate.baseline.x =
TEXT_X_OFFS + (SIS_TEXT_WIDTH >> 1);
syreen_desc.AlienTextTemplate.baseline.y = 0;
NPCPhrase (LIGHTS_OFF_BECAUSE);
DISABLE_PHRASE (why_lights_off);
}