- fixed compile errors

This commit is contained in:
Christoph Oelckers 2020-10-17 10:23:30 +02:00
parent 8aca0774dc
commit 39c154dc15
3 changed files with 2 additions and 3 deletions

1
.gitignore vendored
View file

@ -1,5 +1,4 @@
build-vs2019/ build-vs2019/
build-vs2019-32/
/source/gitinfo.h /source/gitinfo.h
/build2 /build2
/build /build

View file

@ -269,7 +269,7 @@ void lotsofstuff(spritetype* s, short n, int spawntype)
{ {
short r1 = krand(), r2 = krand(); // using the RANDCORRECT version from RR. short r1 = krand(), r2 = krand(); // using the RANDCORRECT version from RR.
// TRANSITIONAL RedNukem sets the spawner as owner. // TRANSITIONAL RedNukem sets the spawner as owner.
j = EGS(s->sectnum, s->x, s->y, s->z - (r2 % (47 << 8)), spawntype, -32, 8, 8, r1 & 2047, 0, 0, 0, 5); j = EGS(s->sectnum, s->x, s->y, s->z - (r2 % (47 << 8)), spawntype, -32, 8, 8, r1 & 2047, 0, 0, (short)0, 5);
sprite[j].cstat = krand() & 12; sprite[j].cstat = krand() & 12;
} }
} }

View file

@ -63,7 +63,7 @@ struct weaponhit
return owner < 0 ? nullptr : &array()[owner]; return owner < 0 ? nullptr : &array()[owner];
} }
inline void SetHitOwner(DDukeActor* a) inline void SetHitOwner(weaponhit* a)
{ {
owner = a->GetIndex(); owner = a->GetIndex();
} }