From 3d942226a5e31c11af5c199b8ba893a628a9edd6 Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Sat, 3 Jan 2026 00:48:02 +0100 Subject: [PATCH] Update hashes, fix floating item spriteroll --- src/d_main.cpp | 4 ++-- src/hardware/hw_main.c | 2 +- src/r_patchrotation.c | 6 ++++++ src/r_things.cpp | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 9e79eaf5f..3f3c281dd 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -93,8 +93,8 @@ #define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291 #define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b #define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9 -#define ASSET_HASH_MAIN_PK3 0xb4bbf7553c13b0c0 -#define ASSET_HASH_MAPPATCH_PK3 0x98b86f9771019f5f +#define ASSET_HASH_MAIN_PK3 0x45e00f9adfbf9f75 +#define ASSET_HASH_MAPPATCH_PK3 0xbbc2c6a7a685da3a #define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461 #ifdef USE_PATCH_FILE #define ASSET_HASH_PATCH_PK3 0x0000000000000000 diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 11af25109..0333e979c 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4846,7 +4846,7 @@ static void HWR_ProjectSprite(mobj_t *thing) { sprdef = &kartitems[thing->threshold > 0 && thing->threshold < numkartitems ? thing->threshold : 0].spritedef; #ifdef ROTSPRITE - sprinfo = &spriteinfo[SPR_UNKN]; + sprinfo = &spriteinfo[SPR_ITEM]; #endif } else diff --git a/src/r_patchrotation.c b/src/r_patchrotation.c index 406c8082e..022613223 100644 --- a/src/r_patchrotation.c +++ b/src/r_patchrotation.c @@ -324,6 +324,12 @@ patch_t *Patch_GetRotatedSprite( //BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer if (adjustfeet) ((patch_t *)rotsprite->patches[idx])->topoffset += FEETADJUST>>FRACBITS; + + if (sprinfo == &spriteinfo[SPR_ITEM]) // easier than funneling this into dorotation... + { + ((patch_t *)rotsprite->patches[idx])->leftoffset += 25; + ((patch_t *)rotsprite->patches[idx])->topoffset += 50; + } } return rotsprite->patches[idx]; diff --git a/src/r_things.cpp b/src/r_things.cpp index 47a56fb0a..24623d6fd 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -1902,7 +1902,7 @@ static void R_ProjectSprite(mobj_t *thing) else if (thing->sprite == SPR_ITEM) { sprdef = &kartitems[thing->threshold > 0 && thing->threshold < numkartitems ? thing->threshold : 0].spritedef; - sprinfo = &spriteinfo[SPR_UNKN]; + sprinfo = &spriteinfo[SPR_ITEM]; if (frame >= sprdef->numframes) { CONS_Alert(CONS_ERROR, M_GetText("R_ProjectSprite: invalid kartitem sprite frame %zu\n"), frame);