From 442b3cfba10bfb5dc8fe1bd8975e03e23aa8275e Mon Sep 17 00:00:00 2001 From: avolkov Date: Fri, 2 Jun 2006 17:50:04 +0000 Subject: [PATCH] Disambiguating the 'Response' identifiers git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2380 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm/druuge/druugec.c | 64 ++++++++++++------------- sc2/src/sc2code/comm/ilwrath/ilwrathc.c | 42 ++++++++-------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/sc2/src/sc2code/comm/druuge/druugec.c b/sc2/src/sc2code/comm/druuge/druugec.c index e387fea04..b73f2fc38 100644 --- a/sc2/src/sc2code/comm/druuge/druugec.c +++ b/sc2/src/sc2code/comm/druuge/druugec.c @@ -153,9 +153,9 @@ static LOCDATA druuge_desc = static COUNT SlaveryCount = 0; static void -ExitConversation (RESPONSE_REF Response) +ExitConversation (RESPONSE_REF R) { - if (PLAYER_SAID (Response, bye)) + if (PLAYER_SAID (R, bye)) { SET_GAME_STATE (BATTLE_SEGUE, 0); @@ -199,7 +199,7 @@ ExitConversation (RESPONSE_REF Response) else NPCPhrase (GOODBYE_FROM_SPACE); } - else /* if (Response == then_we_take_bomb) */ + else /* if (R == then_we_take_bomb) */ { SET_GAME_STATE (BATTLE_SEGUE, 1); @@ -207,13 +207,13 @@ ExitConversation (RESPONSE_REF Response) } } -static void TradeWorld (RESPONSE_REF Response); +static void TradeWorld (RESPONSE_REF R); static void -Buy (RESPONSE_REF Response) +Buy (RESPONSE_REF R) { - if (PLAYER_SAID (Response, want_to_buy) - || PLAYER_SAID (Response, im_ready_to_buy)) + if (PLAYER_SAID (R, want_to_buy) + || PLAYER_SAID (R, im_ready_to_buy)) { NPCPhrase (READY_TO_SELL); if (!GET_GAME_STATE (ROSY_SPHERE)) @@ -226,7 +226,7 @@ Buy (RESPONSE_REF Response) SET_GAME_STATE (KNOW_DRUUGE_SLAVERS, 3); } - else if (PLAYER_SAID (Response, buy_druuge_ship)) + else if (PLAYER_SAID (R, buy_druuge_ship)) { #define SHIP_CREW_COST 100 if (GLOBAL_SIS (CrewEnlisted) < SHIP_CREW_COST) @@ -245,7 +245,7 @@ Buy (RESPONSE_REF Response) } } #define ARTIFACT_CREW_COST 100 - else if (PLAYER_SAID (Response, buy_rosy_sphere)) + else if (PLAYER_SAID (R, buy_rosy_sphere)) { if (GLOBAL_SIS (CrewEnlisted) < ARTIFACT_CREW_COST) NPCPhrase (NOT_ENOUGH_CREW); @@ -261,7 +261,7 @@ Buy (RESPONSE_REF Response) NPCPhrase (BOUGHT_SPHERE); } } - else if (PLAYER_SAID (Response, buy_art_1)) + else if (PLAYER_SAID (R, buy_art_1)) { if (GLOBAL_SIS (CrewEnlisted) < ARTIFACT_CREW_COST) NPCPhrase (NOT_ENOUGH_CREW); @@ -276,7 +276,7 @@ Buy (RESPONSE_REF Response) NPCPhrase (BOUGHT_ART_1); } } - else if (PLAYER_SAID (Response, buy_art_2)) + else if (PLAYER_SAID (R, buy_art_2)) { if (GLOBAL_SIS (CrewEnlisted) < ARTIFACT_CREW_COST) NPCPhrase (NOT_ENOUGH_CREW); @@ -291,7 +291,7 @@ Buy (RESPONSE_REF Response) NPCPhrase (BOUGHT_ART_2); } } - else if (PLAYER_SAID (Response, buy_fuel)) + else if (PLAYER_SAID (R, buy_fuel)) { #define FUEL_CREW_COST 10 if (GLOBAL_SIS (CrewEnlisted) < FUEL_CREW_COST) @@ -485,16 +485,16 @@ DoTransaction (RESPONSE_REF R) } static void -Sell (RESPONSE_REF Response) +Sell (RESPONSE_REF R) { RESPONSE_FUNC RespFunc; - if (PLAYER_SAID (Response, want_to_sell)) + if (PLAYER_SAID (R, want_to_sell)) NPCPhrase (READY_TO_BUY); - else if (PLAYER_SAID (Response, no_way) - || PLAYER_SAID (Response, way)) + else if (PLAYER_SAID (R, no_way) + || PLAYER_SAID (R, way)) { - if (PLAYER_SAID (Response, no_way)) + if (PLAYER_SAID (R, no_way)) NPCPhrase (OK_REGULAR_DEAL); else { @@ -505,12 +505,12 @@ Sell (RESPONSE_REF Response) DoTransaction (LastResponse); } - else if (PLAYER_SAID (Response, sell_maidens) - || PLAYER_SAID (Response, sell_fragments) - || PLAYER_SAID (Response, sell_caster) - || PLAYER_SAID (Response, sell_spawner)) + else if (PLAYER_SAID (R, sell_maidens) + || PLAYER_SAID (R, sell_fragments) + || PLAYER_SAID (R, sell_caster) + || PLAYER_SAID (R, sell_spawner)) { - DoTransaction (Response); + DoTransaction (R); } if (!GET_GAME_STATE (ROSY_SPHERE)) @@ -563,9 +563,9 @@ ExplainSlaveTrade (RESPONSE_REF R) } static void -TradeWorld (RESPONSE_REF Response) +TradeWorld (RESPONSE_REF R) { - if (PLAYER_SAID (Response, whats_up_at_trade_world)) + if (PLAYER_SAID (R, whats_up_at_trade_world)) { BYTE NumVisits; @@ -593,11 +593,11 @@ TradeWorld (RESPONSE_REF Response) SET_GAME_STATE (DRUUGE_HOME_INFO, NumVisits); DISABLE_PHRASE (whats_up_at_trade_world); } - else if (PLAYER_SAID (Response, done_selling)) + else if (PLAYER_SAID (R, done_selling)) NPCPhrase (OK_DONE_SELLING); - else if (PLAYER_SAID (Response, done_buying)) + else if (PLAYER_SAID (R, done_buying)) NPCPhrase (OK_DONE_BUYING); - else if (PLAYER_SAID (Response, i_will_never_trade_crew)) + else if (PLAYER_SAID (R, i_will_never_trade_crew)) NPCPhrase (YOUR_LOSS); if (PHRASE_ENABLED (whats_up_at_trade_world)) @@ -613,14 +613,14 @@ TradeWorld (RESPONSE_REF Response) } static void -BombAmbush (RESPONSE_REF Response) +BombAmbush (RESPONSE_REF R) { - if (PLAYER_SAID (Response, whats_up_at_bomb_planet)) + if (PLAYER_SAID (R, whats_up_at_bomb_planet)) { NPCPhrase (GEN_INFO_AT_BOMB_PLANET); SET_GAME_STATE (BOMB_VISITS, 2); } - else if (PLAYER_SAID (Response, we_get_bomb)) + else if (PLAYER_SAID (R, we_get_bomb)) { NPCPhrase (NOT_GET_BOMB); SET_GAME_STATE (BOMB_VISITS, 3); @@ -642,9 +642,9 @@ BombAmbush (RESPONSE_REF Response) } static void -Space (RESPONSE_REF Response) +Space (RESPONSE_REF R) { - if (PLAYER_SAID (Response, whats_up_in_space)) + if (PLAYER_SAID (R, whats_up_in_space)) { BYTE NumVisits; diff --git a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c index 8fabec919..b81f82e54 100644 --- a/sc2/src/sc2code/comm/ilwrath/ilwrathc.c +++ b/sc2/src/sc2code/comm/ilwrath/ilwrathc.c @@ -94,42 +94,42 @@ static LOCDATA ilwrath_desc = }; static void -CombatIsInevitable (RESPONSE_REF Response) +CombatIsInevitable (RESPONSE_REF R) { SET_GAME_STATE (BATTLE_SEGUE, 1); - if (PLAYER_SAID (Response, you_are_weak)) + if (PLAYER_SAID (R, you_are_weak)) NPCPhrase (STRENGTH_NOT_ALL); - else if (PLAYER_SAID (Response, slay_by_thousands)) + else if (PLAYER_SAID (R, slay_by_thousands)) NPCPhrase (NO_SLAY_BY_THOUSANDS); - else if (PLAYER_SAID (Response, ease_up)) + else if (PLAYER_SAID (R, ease_up)) NPCPhrase (NO_EASE_UP); - else if (PLAYER_SAID (Response, bye_space)) + else if (PLAYER_SAID (R, bye_space)) NPCPhrase (GOODBYE_AND_DIE_SPACE); - else if (PLAYER_SAID (Response, bye_homeworld)) + else if (PLAYER_SAID (R, bye_homeworld)) NPCPhrase (GOODBYE_AND_DIE_HOMEWORLD); - else if (PLAYER_SAID (Response, want_peace)) + else if (PLAYER_SAID (R, want_peace)) NPCPhrase (NO_PEACE); - else if (PLAYER_SAID (Response, want_alliance)) + else if (PLAYER_SAID (R, want_alliance)) NPCPhrase (NO_ALLIANCE); - else if (PLAYER_SAID (Response, but_evil_is_defined)) + else if (PLAYER_SAID (R, but_evil_is_defined)) NPCPhrase (DONT_CONFUSE_US); - else if (PLAYER_SAID (Response, bye_gods)) + else if (PLAYER_SAID (R, bye_gods)) { NPCPhrase (GOODBYE_GODS); SET_GAME_STATE (BATTLE_SEGUE, 0); } - if (PLAYER_SAID (Response, whats_up)) + if (PLAYER_SAID (R, whats_up)) { NPCPhrase (GENERAL_INFO); Response (bye, CombatIsInevitable); } - else if (PLAYER_SAID (Response, whats_up_space_1) - || PLAYER_SAID (Response, whats_up_space_2) - || PLAYER_SAID (Response, whats_up_space_3) - || PLAYER_SAID (Response, whats_up_space_4) - || PLAYER_SAID (Response, whats_up_space_5)) + else if (PLAYER_SAID (R, whats_up_space_1) + || PLAYER_SAID (R, whats_up_space_2) + || PLAYER_SAID (R, whats_up_space_3) + || PLAYER_SAID (R, whats_up_space_4) + || PLAYER_SAID (R, whats_up_space_5)) { BYTE NumVisits; @@ -157,15 +157,15 @@ CombatIsInevitable (RESPONSE_REF Response) } else { - if (PLAYER_SAID (Response, bye)) + if (PLAYER_SAID (R, bye)) NPCPhrase (GOODBYE_AND_DIE); - else if (PLAYER_SAID (Response, where_you_come_from)) + else if (PLAYER_SAID (R, where_you_come_from)) NPCPhrase (CAME_FROM); - if (PLAYER_SAID (Response, it_will_be_a_pleasure)) + if (PLAYER_SAID (R, it_will_be_a_pleasure)) NPCPhrase (WHO_BLASTS_WHO); - if (PLAYER_SAID (Response, surrender)) + if (PLAYER_SAID (R, surrender)) NPCPhrase (NO_SURRENDER); - if (PLAYER_SAID (Response, be_reasonable)) + if (PLAYER_SAID (R, be_reasonable)) NPCPhrase (NOT_REASONABLE); } }