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

(svn r11484) -Codechange: Remove the doubled function SetBitT and rename the remaining to fit with the naming style

Browse Source
This commit is contained in:
skidd13
2007-11-20 13:35:54 +00:00
parent b8885630aa
commit eeaa348f8b
45 changed files with 161 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/players.cpp
View File

@@ -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);
}
}