From 39c154dc154db72a25f3320d4e8fd7651aff52eb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 17 Oct 2020 10:23:30 +0200 Subject: [PATCH] - fixed compile errors --- .gitignore | 1 - source/games/duke/src/actors.cpp | 2 +- source/games/duke/src/types.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9b954ffce..319a2fe5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ build-vs2019/ -build-vs2019-32/ /source/gitinfo.h /build2 /build diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index fa511a48d..817d58605 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -269,7 +269,7 @@ void lotsofstuff(spritetype* s, short n, int spawntype) { short r1 = krand(), r2 = krand(); // using the RANDCORRECT version from RR. // 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; } } diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 5f82cb849..caad71b10 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -63,7 +63,7 @@ struct weaponhit return owner < 0 ? nullptr : &array()[owner]; } - inline void SetHitOwner(DDukeActor* a) + inline void SetHitOwner(weaponhit* a) { owner = a->GetIndex(); }