dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r1977) Typedef some enums and struct plus some minor style changes

Browse Source
This commit is contained in:
tron
2005-03-09 19:42:37 +00:00
parent e6e3e69da4
commit 9bc68d209f
2 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
table/namegen.h
View File

@@ -1666,7 +1666,7 @@ static const char *name_czech_real[] = {
* with cloning this for your own language. */
// Sing., pl.
enum CzechGender {
typedef enum CzechGender {
CZG_SMASC,
CZG_SFEM,
CZG_SNEUT,
@@ -1677,16 +1677,16 @@ enum CzechGender {
CZG_FREE,
// Like CZG_FREE, but disallow CZG_SNEUT.
CZG_NFREE
};
enum CzechPattern {
} CzechGender;
typedef enum CzechPattern {
CZP_JARNI,
CZP_MLADY,
CZP_PRIVL
};
} CzechPattern;
/* [CzechGender][CzechPattern] - replaces the last character of the adjective
* by this. */
// XXX: [CZG_SMASC][CZP_PRIVL] needs special handling: -ovX -> -uv.
static const char name_czech_patmod[6][3] = {
static const char name_czech_patmod[][3] = {
/* CZG_SMASC */ { '<EFBFBD>', '<EFBFBD>', 'X' },
/* CZG_SFEM */ { '<EFBFBD>', '<EFBFBD>', 'a' },
/* CZG_SNEUT */ { '<EFBFBD>', '<EFBFBD>', 'o' },
@@ -1697,36 +1697,36 @@ static const char name_czech_patmod[6][3] = {
// This way the substantives can choose only some adjectives/endings:
// At least one of these flags must be satisfied:
enum CzechAllow {
typedef enum CzechAllow {
CZA_SHORT = 1,
CZA_MIDDLE = 2,
CZA_LONG = 4,
CZA_ALL = ~0
};
} CzechAllow;
// All these flags must be satisfied (in the stem->others direction):
enum CzechChoose {
typedef enum CzechChoose {
CZC_NONE = 0, // No requirements.
CZC_COLOR = 1,
CZC_POSTFIX = 2, // Matched if postfix was inserted.
CZC_NOPOSTFIX = 4, // Matched if no postfix was inserted.
CZC_ANY = ~0
};
} CzechChoose;
struct CzechNameSubst {
enum CzechGender gender;
enum CzechAllow allow;
enum CzechChoose choose;
typedef struct CzechNameSubst {
CzechGender gender;
CzechAllow allow;
CzechChoose choose;
const char *name;
};
} CzechNameSubst;
struct CzechNameAdj {
enum CzechPattern pattern;
enum CzechChoose choose;
typedef struct CzechNameAdj {
CzechPattern pattern;
CzechChoose choose;
const char *name;
};
} CzechNameAdj;
// Some of items which should be common are doubled.
static const struct CzechNameAdj name_czech_adj[] = {
static const CzechNameAdj name_czech_adj[] = {
{ CZP_JARNI, CZC_ANY, "Horn<EFBFBD>" },
{ CZP_JARNI, CZC_ANY, "Horn<EFBFBD>" },
{ CZP_JARNI, CZC_ANY, "Doln<EFBFBD>" },
@@ -1778,7 +1778,7 @@ static const struct CzechNameAdj name_czech_adj[] = {
};
// Considered a stem for choose/allow matching purposes.
static const struct CzechNameSubst name_czech_subst_full[] = {
static const CzechNameSubst name_czech_subst_full[] = {
{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Sedlec" },
{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Brod" },
{ CZG_SMASC, CZA_ALL, CZC_COLOR, "Brod" },
@@ -1798,7 +1798,7 @@ static const struct CzechNameSubst name_czech_subst_full[] = {
};
// TODO: More stems needed. --pasky
static const struct CzechNameSubst name_czech_subst_stem[] = {
static const CzechNameSubst name_czech_subst_stem[] = {
{ CZG_SMASC, CZA_MIDDLE, CZC_COLOR, "Kostel" },
{ CZG_SMASC, CZA_MIDDLE, CZC_COLOR, "Kl<EFBFBD>ster" },
{ CZG_SMASC, CZA_SHORT, CZC_COLOR, "Lhot" },
@@ -1851,7 +1851,7 @@ static const char *name_czech_subst_postfix[] = {
};
// This array must have the both neutral genders at the end!
static const struct CzechNameSubst name_czech_subst_ending[] = {
static const CzechNameSubst name_czech_subst_ending[] = {
{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE, CZC_ANY, "ec" },
{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE, CZC_ANY, "<EFBFBD>n" },
{ CZG_SMASC, CZA_SHORT | CZA_MIDDLE | CZA_LONG, CZC_ANY, "ov" },