Fixed Spathi Homeworld lockup bug

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@95 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2002-10-02 07:41:20 +00:00
parent 2a404fd64e
commit b8e00b689b
+61 -64
View File
@@ -23,12 +23,24 @@ enum
{ {
null_phrase, null_phrase,
killed_fwiffo, killed_fwiffo,
POOR_FWIFFO,
fwiffo_fine, fwiffo_fine,
NOT_LIKELY,
we_attack_again, we_attack_again,
WE_FIGHT_AGAIN,
bye_no_ally_offer, bye_no_ally_offer,
GOODBYE_NO_ALLY_OFFER,
bye_angry_spathi, bye_angry_spathi,
GOODBYE_ANGRY_SPATHI,
why_dont_you_do_it, why_dont_you_do_it,
WE_WONT_BECAUSE,
MEAN_GUYS_RETURN,
we_apologize, we_apologize,
DONT_BELIEVE,
HELLO_AGAIN,
HATE_YOU_FOREVER,
WHAT_IS_PASSWORD,
WHAT_IS_PASSWORD_AGAIN,
we_are_vindicator0, we_are_vindicator0,
we_are_vindicator1, we_are_vindicator1,
we_are_vindicator2, we_are_vindicator2,
@@ -38,139 +50,124 @@ enum
wagngl_fthagn, wagngl_fthagn,
screw_password, screw_password,
good_password, good_password,
WRONG_PASSWORD,
NO_PASSWORD,
what_do_i_get, what_do_i_get,
YOU_GET_TO_LIVE,
YES_GOOD_PASSWORD,
spathi_on_pluto, spathi_on_pluto,
WHERE_SPATHI,
hostage, hostage,
GUN_TO_HEAD,
we_come_in_peace, we_come_in_peace,
OF_COURSE,
KILLED_SPATHI,
misunderstanding, misunderstanding,
JUST_MISUNDERSTANDING,
//JUST_MISUNDERSTANDING0,
JUST_MISUNDERSTANDING1,
give_us_resources, give_us_resources,
NO_RESOURCES,
resources_please, resources_please,
SORRY_NO_RESOURCES,
bye_ally, bye_ally,
GOODBYE_ALLY,
what_about_hierarchy, what_about_hierarchy,
what_about_history, what_about_history,
what_about_alliance, what_about_alliance,
what_about_other, what_about_other,
what_about_precursors, what_about_precursors,
enough_info, enough_info,
little_mistake,
bye_before_party,
something_fishy,
surrender,
surrender_or_die,
hand_in_friendship,
stronger,
yes_we_are,
how_prove,
share_info,
prove_strength,
what_test,
think_more,
tell_evil,
i_accept,
talk_test,
already_got_them,
too_dangerous,
killed_them_all_1,
killed_them_all_2,
zapped_a_few,
no_landing,
saw_creatures,
bye_from_party_1,
bye_from_party_2,
bye_from_party_3,
deals_a_deal,
how_long,
reneging,
return_beasts,
minds_and_might,
fellowship,
do_as_we_say,
whats_up,
like_some_info
};
enum
{
NULL_PHRASE,
POOR_FWIFFO,
NOT_LIKELY,
WE_FIGHT_AGAIN,
GOODBYE_NO_ALLY_OFFER,
GOODBYE_ANGRY_SPATHI,
WE_WONT_BECAUSE,
MEAN_GUYS_RETURN,
DONT_BELIEVE,
HELLO_AGAIN,
HATE_YOU_FOREVER,
WHAT_IS_PASSWORD,
WHAT_IS_PASSWORD_AGAIN,
WRONG_PASSWORD,
NO_PASSWORD,
YOU_GET_TO_LIVE,
YES_GOOD_PASSWORD,
WHERE_SPATHI,
GUN_TO_HEAD,
OF_COURSE,
KILLED_SPATHI,
JUST_MISUNDERSTANDING,
NO_RESOURCES,
SORRY_NO_RESOURCES,
GOODBYE_ALLY,
OK_ENOUGH_INFO, OK_ENOUGH_INFO,
ABOUT_HIERARCHY, ABOUT_HIERARCHY,
ABOUT_HISTORY, ABOUT_HISTORY,
ABOUT_ALLIANCE, ABOUT_ALLIANCE,
ABOUT_OTHER, ABOUT_OTHER,
ABOUT_PRECURSORS, ABOUT_PRECURSORS,
little_mistake,
BIG_MISTAKE, BIG_MISTAKE,
bye_before_party,
QUEST_AGAIN, QUEST_AGAIN,
GOODBYE_BEFORE_PARTY, GOODBYE_BEFORE_PARTY,
GOOD_START, GOOD_START,
something_fishy,
NOTHING_FISHY, NOTHING_FISHY,
surrender,
NO_SURRENDER, NO_SURRENDER,
surrender_or_die,
DEFEND_OURSELVES, DEFEND_OURSELVES,
hand_in_friendship,
TOO_AFRAID, TOO_AFRAID,
stronger,
YOURE_NOT, YOURE_NOT,
yes_we_are,
NO_YOURE_NOT, NO_YOURE_NOT,
how_prove,
BETTER_IDEA, BETTER_IDEA,
share_info,
NO_INFO, NO_INFO,
WE_UNDERSTAND, WE_UNDERSTAND,
prove_strength,
YOUR_BEHAVIOR, YOUR_BEHAVIOR,
what_test,
BEFORE_ACCEPT, BEFORE_ACCEPT,
WIPE_EVIL, WIPE_EVIL,
think_more,
COWARD, COWARD,
tell_evil,
i_accept,
AWAIT_RETURN, AWAIT_RETURN,
talk_test,
already_got_them,
EARLY_BIRD_CHECK, EARLY_BIRD_CHECK,
NOT_SURPRISED, NOT_SURPRISED,
TEST_AGAIN, TEST_AGAIN,
too_dangerous,
WE_AGREE, WE_AGREE,
HOW_GO_EFFORTS, HOW_GO_EFFORTS,
killed_them_all_1,
killed_them_all_2,
WILL_CHECK_1, WILL_CHECK_1,
WILL_CHECK_2, WILL_CHECK_2,
zapped_a_few,
RETURN_COMPLETE, RETURN_COMPLETE,
MUST_DESTROY_ALL, MUST_DESTROY_ALL,
no_landing,
saw_creatures,
YOU_FORTUNATE, YOU_FORTUNATE,
YOU_LIED_1, YOU_LIED_1,
YOU_LIED_2, YOU_LIED_2,
bye_from_party_1,
bye_from_party_2,
bye_from_party_3,
GOODBYE_FROM_PARTY, GOODBYE_FROM_PARTY,
MUST_PARTY_1, MUST_PARTY_1,
MUST_PARTY_2, MUST_PARTY_2,
MUST_PARTY_3, MUST_PARTY_3,
deals_a_deal,
WAIT_A_WHILE, WAIT_A_WHILE,
how_long,
TEN_YEARS, TEN_YEARS,
reneging,
ADULT_VIEW, ADULT_VIEW,
return_beasts,
WHAT_RELATIONSHIP, WHAT_RELATIONSHIP,
minds_and_might,
HUH, HUH,
fellowship,
WHAT, WHAT,
do_as_we_say,
DEPART_FOR_EARTH, DEPART_FOR_EARTH,
HELLO_ALLIES_1, HELLO_ALLIES_1,
HELLO_ALLIES_2, HELLO_ALLIES_2,
HELLO_ALLIES_3, HELLO_ALLIES_3,
whats_up,
GENERAL_INFO_1, GENERAL_INFO_1,
GENERAL_INFO_2, GENERAL_INFO_2,
GENERAL_INFO_3, GENERAL_INFO_3,
GENERAL_INFO_4, GENERAL_INFO_4,
GENERAL_INFO_5, GENERAL_INFO_5,
like_some_info,
WHAT_ABOUT WHAT_ABOUT
}; };