- more XCode warnings fixed.

This commit is contained in:
Christoph Oelckers 2019-01-28 15:41:52 +01:00
parent d1ca3ef994
commit 44f622c644
3 changed files with 8 additions and 6 deletions

View file

@ -2671,14 +2671,15 @@ void DAutomap::rotatePoint (double *x, double *y)
void DAutomap::drawLineCharacter(const mline_t *lineguy, size_t lineguylines, double scale, DAngle angle, const AMColor &color, double x, double y)
{
int i;
mline_t l;
for (i=0;i<lineguylines;i++) {
for (size_t i=0;i<lineguylines;i++)
{
l.a.x = lineguy[i].a.x;
l.a.y = lineguy[i].a.y;
if (scale) {
if (scale)
{
l.a.x *= scale;
l.a.y *= scale;
}
@ -2692,7 +2693,8 @@ void DAutomap::drawLineCharacter(const mline_t *lineguy, size_t lineguylines, do
l.b.x = lineguy[i].b.x;
l.b.y = lineguy[i].b.y;
if (scale) {
if (scale)
{
l.b.x *= scale;
l.b.y *= scale;
}

View file

@ -1464,7 +1464,7 @@ void FLevelLocals::Init()
gravity = sv_gravity * 35/TICRATE;
aircontrol = sv_aircontrol;
teamdamage = teamdamage;
teamdamage = ::teamdamage;
flags = 0;
flags2 = 0;
flags3 = 0;

View file

@ -275,7 +275,7 @@ static int ParseStandardProperty(FScanner &scanner, UMapEntry *mape)
{
// This cannot be evaluated here because this needs to be done in the context of the level being used.
FSpecialAction & bossact = mape->BossActions[mape->BossActions.Reserve(1)];
bossact = { type, special | 0x40000000, tag };
bossact = { type, special | 0x40000000, {tag} };
};
}
}