From cb1e4e7a34784cc68f8a2e55fadfce609d2d5fca Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Thu, 16 Mar 2023 13:05:22 +1100 Subject: [PATCH] - Exhumed: Ensure `Player::items[]` is signed. * Change originates from b71c725e3ebbf0cfb72c711d72dfccc00758f55c. * Matches PCExhumed and GDX. * Logic in game requires this variable to be signed. * Fixes #415. * Fixes #888. --- source/games/exhumed/src/player.h | 2 +- wadsrc/static/zscript/games/exhumed/exhumedgame.zs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/games/exhumed/src/player.h b/source/games/exhumed/src/player.h index 1363c6b4b..dceddcb9f 100644 --- a/source/games/exhumed/src/player.h +++ b/source/games/exhumed/src/player.h @@ -66,7 +66,7 @@ struct Player int16_t nMagic; int16_t nItem; int8_t nCurrentItem; - uint8_t items[8]; + int8_t items[8]; int16_t nAmmo[7]; // TODO - kMaxWeapons? int16_t nCurrentWeapon; diff --git a/wadsrc/static/zscript/games/exhumed/exhumedgame.zs b/wadsrc/static/zscript/games/exhumed/exhumedgame.zs index 0b4a5fa2e..947856800 100644 --- a/wadsrc/static/zscript/games/exhumed/exhumedgame.zs +++ b/wadsrc/static/zscript/games/exhumed/exhumedgame.zs @@ -50,7 +50,7 @@ struct ExhumedPlayer native native uint16 keys; native int16 nMagic; native int16 nItem; - native uint8 items[8]; + native int8 items[8]; native int16 nAmmo[7]; // TODO - kMaxWeapons? native int16 nPlayerWeapons;