diff --git a/sc2/src/sc2code/comm/shofixt/shofixt.c b/sc2/src/sc2code/comm/shofixt/shofixt.c index a5d2873de..09dff0c22 100644 --- a/sc2/src/sc2code/comm/shofixt/shofixt.c +++ b/sc2/src/sc2code/comm/shofixt/shofixt.c @@ -428,9 +428,7 @@ Friendly (RESPONSE_REF R) memset (Resp, 0, sizeof (Resp)); if (PLAYER_SAID (R, report0)) { - NPCPhrase (NOTHING_NEW0); - NPCPhrase (GLOBAL_PLAYER_NAME); - NPCPhrase (NOTHING_NEW1); + NPCPhrase (NOTHING_NEW); DISABLE_PHRASE (report0); } @@ -555,11 +553,7 @@ Intro (void) if (GET_GAME_STATE (SHOFIXTI_STACK2) > 2) { - NPCPhrase (FRIENDLY_HELLO0); - NPCPhrase (GLOBAL_PLAYER_NAME); - NPCPhrase (FRIENDLY_HELLO1); - NPCPhrase (GLOBAL_SHIP_NAME); - NPCPhrase (FRIENDLY_HELLO2); + NPCPhrase (FRIENDLY_HELLO); Friendly ((RESPONSE_REF)0); } diff --git a/sc2/src/sc2code/comm/shofixt/strings.h b/sc2/src/sc2code/comm/shofixt/strings.h index 321854698..51413fe4d 100644 --- a/sc2/src/sc2code/comm/shofixt/strings.h +++ b/sc2/src/sc2code/comm/shofixt/strings.h @@ -112,13 +112,10 @@ enum SWITCH_BROKE, bye, GOODBYE, - FRIENDLY_HELLO0, - FRIENDLY_HELLO1, - FRIENDLY_HELLO2, + FRIENDLY_HELLO, report0, report1, - NOTHING_NEW0, - NOTHING_NEW1, + NOTHING_NEW, OUT_TAKES, };