From b930feb6a6a0645ca15429ba8545bfdbd54df97d Mon Sep 17 00:00:00 2001 From: truelight Date: Sun, 22 Aug 2004 15:57:46 +0000 Subject: (svn r112) -Fix: converted all linebreaks to UNIX-linebreak (\n) (forgot one file) --- namegen.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/namegen.c b/namegen.c index 8e5fe0f7e..1692ff031 100644 --- a/namegen.c +++ b/namegen.c @@ -118,8 +118,8 @@ static const char english_6[] = MK(" Ridge") MK(" Springs") ; - -#define REPLACE_WORDS(a,b,c,d,e,f,g,h) { if (start[0] == a && start[1] == b && start[2] == c && start[3] == d) { start[0] = e; start[1] = f; start[2] = g; start[3] = h; } } + +#define REPLACE_WORDS(a,b,c,d,e,f,g,h) { if (start[0] == a && start[1] == b && start[2] == c && start[3] == d) { start[0] = e; start[1] = f; start[2] = g; start[3] = h; } } static byte MakeEnglishTownName(byte *buf, uint32 seed) { @@ -151,17 +151,17 @@ static byte MakeEnglishTownName(byte *buf, uint32 seed) start[0] = 'K'; /* Replace certain words (routine identical to TTD now) */ - - REPLACE_WORDS('C','u','n','t', 'E','a','s','t'); - REPLACE_WORDS('S','l','a','g', 'P','i','t','s'); - REPLACE_WORDS('S','l','u','t', 'E','d','i','n'); -// REPLACE_WORDS('F','a','r','t', 'B','o','o','t'); - REPLACE_WORDS('D','r','a','r', 'Q','u','a','r'); - REPLACE_WORDS('D','r','e','h', 'B','a','s','h'); - REPLACE_WORDS('F','r','a','r', 'S','h','o','r'); - REPLACE_WORDS('G','r','a','r', 'A','b','e','r'); - REPLACE_WORDS('B','r','a','r', 'O','v','e','r'); - REPLACE_WORDS('W','r','a','r', 'I','n','v','e'); + + REPLACE_WORDS('C','u','n','t', 'E','a','s','t'); + REPLACE_WORDS('S','l','a','g', 'P','i','t','s'); + REPLACE_WORDS('S','l','u','t', 'E','d','i','n'); +// REPLACE_WORDS('F','a','r','t', 'B','o','o','t'); + REPLACE_WORDS('D','r','a','r', 'Q','u','a','r'); + REPLACE_WORDS('D','r','e','h', 'B','a','s','h'); + REPLACE_WORDS('F','r','a','r', 'S','h','o','r'); + REPLACE_WORDS('G','r','a','r', 'A','b','e','r'); + REPLACE_WORDS('B','r','a','r', 'O','v','e','r'); + REPLACE_WORDS('W','r','a','r', 'I','n','v','e'); return result; } -- cgit v1.2.3-70-g09d2