mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-13 12:38:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rando - Fix ice traps & get item logic (#2210)

Browse Source 
* Fix ice traps & get item logic

* Fix shop keepers & more draw logic cleanup
This commit is contained in:
aMannus
2022-12-21 05:32:01 +01:00
committed by GitHub
parent 6f7361e1a4
commit a1a6c07549
7 changed files with 90 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_draw.c
+1 -3
View File
@@ -400,9 +400,7 @@ void GetItem_Draw(PlayState* play, s16 drawId) {
* Uses the Custom Draw Function if it exists, or just calls `GetItem_Draw`
*/
void GetItemEntry_Draw(PlayState* play, GetItemEntry getItemEntry) {
// RANDOTODO: Make this more flexible for easier toggling of individual item recolors in the future.
if (getItemEntry.drawFunc != NULL &&
(CVar_GetS32("gRandoMatchKeyColors", 0) || getItemEntry.getItemId == RG_DOUBLE_DEFENSE)) {
if (getItemEntry.drawFunc != NULL) {
getItemEntry.drawFunc(play, &getItemEntry);
} else {
GetItem_Draw(play, getItemEntry.gid);