diff options
| author | skidd13 <skidd13@openttd.org> | 2007-11-20 13:35:54 +0000 |
|---|---|---|
| committer | skidd13 <skidd13@openttd.org> | 2007-11-20 13:35:54 +0000 |
| commit | eeaa348f8bfafae1a6e56b857a97d9d23577dcac (patch) | |
| tree | 51f15a2e52f58ea4446467086c5441cebe4324bf /src/players.cpp | |
| parent | b8885630aa9942ea924ffb6eeabc266140485435 (diff) | |
| download | openttd-eeaa348f8bfafae1a6e56b857a97d9d23577dcac.tar.xz | |
(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style
Diffstat (limited to 'src/players.cpp')
| -rw-r--r-- | src/players.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/players.cpp b/src/players.cpp index 4d2f21b26..13aff85bc 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -90,8 +90,8 @@ PlayerFace ConvertFromOldPlayerFace(uint32 face) PlayerFace pf = 0; GenderEthnicity ge = GE_WM; - if (HasBit(face, 31)) SetBitT(ge, GENDER_FEMALE); - if (HasBit(face, 27) && (HasBit(face, 26) == HasBit(face, 19))) SetBitT(ge, ETHNICITY_BLACK); + if (HasBit(face, 31)) SetBit(ge, GENDER_FEMALE); + if (HasBit(face, 27) && (HasBit(face, 26) == HasBit(face, 19))) SetBit(ge, ETHNICITY_BLACK); SetPlayerFaceBits(pf, PFV_GEN_ETHN, ge, ge); SetPlayerFaceBits(pf, PFV_HAS_GLASSES, ge, GB(face, 28, 3) <= 1); @@ -603,7 +603,7 @@ byte GetPlayerRailtypes(PlayerID p) if (rvi->railveh_type != RAILVEH_WAGON) { assert(rvi->railtype < RAILTYPE_END); - SETBIT(rt, rvi->railtype); + SetBit(rt, rvi->railtype); } } } @@ -622,7 +622,7 @@ byte GetPlayerRoadtypes(PlayerID p) if (e->type == VEH_ROAD && HasBit(ei->climates, _opt.landscape) && (HasBit(e->player_avail, p) || _date >= e->intro_date + 365)) { - SETBIT(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD); + SetBit(rt, HasBit(ei->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD); } } |