From 91e6e37c518bba53d75c0dcee3bf88b2bf55e1d3 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Thu, 13 May 2021 04:39:54 +0000 Subject: [PATCH] Improvement for r9018: code uses enums and includes two more cursor states for both knife and punch cursor which were still not showing circles (by Shadooow). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9019 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Utils/Cursors.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utils/Cursors.cpp b/Utils/Cursors.cpp index f501cb03..1f312ff1 100644 --- a/Utils/Cursors.cpp +++ b/Utils/Cursors.cpp @@ -1892,7 +1892,7 @@ void UpdateAnimatedCursorFrames( UINT32 uiCursorIndex ) pCurImage = &( pCurData->Composites[ cnt ] ); // Flugente: now using enums instead of hardcoded values //CHRISL: NCTH uses a completely different cursor so if we're in NCTH mode, we want to use different graphics - if (UsingNewCTHSystem() == true && uiCursorIndex != 25 && uiCursorIndex != 26 && uiCursorIndex != 28 && uiCursorIndex != 39 && uiCursorIndex != 40 && uiCursorIndex != 42) + if (UsingNewCTHSystem() == true && !(uiCursorIndex >= CURSOR_PUNCHRED_ON1 && uiCursorIndex <= CURSOR_PUNCHNOGO_ON2) && !(uiCursorIndex >= CURSOR_KNIFE_HIT_ON1 && uiCursorIndex <= CURSOR_KNIFE_NOGO_ON2)) { switch(pCurImage->uiFileIndex) {