From c7db7c96fa14dd2054e05b756d44d8846a19a827 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Tue, 21 Jan 2025 17:36:33 +0000 Subject: [PATCH] Change: Make NFORenum not care about missing 8bpp sprites. --- src/lang/message_english.h | 1 - src/nforenum.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/lang/message_english.h b/src/lang/message_english.h index 4472a096..fec17416 100644 --- a/src/lang/message_english.h +++ b/src/lang/message_english.h @@ -278,7 +278,6 @@ NFO_MESSAGE(INVALID_ACT2_FLAGS,"Unknown flag set (offset %d) in advanced action2 NFO_MESSAGE(NOT_IN_REALSPRITE,"Found realsprite continuation line while looking for sprite %d.\n",0) NFO_MESSAGE(REAL_UNKNOWN_FLAG,"Unknown or duplicate flag '%t'.\n",0) NFO_MESSAGE(REAL_DUPLICATE_ZOOM,"Duplicate zoomlevel/depth sprite.\n",0) -NFO_MESSAGE(REAL_8BPP_NORMAL_FIRST,"8bpp normal zoom sprite must appear first.\n",0) NFO_MESSAGE(REAL_32BPP_BEFORE_MASK,"mask sprites must be preceded by 32bpp sprites.\n",0) NFO_MESSAGE(UNKNOWN_ACT0_DATA,"Unknown data does not allow processesing past this point.\n",USE_PREFIX|HAS_OFFSET) diff --git a/src/nforenum.cpp b/src/nforenum.cpp index fa85a510..a78da9a9 100644 --- a/src/nforenum.cpp +++ b/src/nforenum.cpp @@ -681,7 +681,6 @@ bool verify_real(string&data,RealSpriteState&formats){ format.bpp32 = depth=="32bpp"; format.zoom = zoom; - if (formats.present.empty()&&(format.bpp32||format.zoom!=0)) IssueMessage(0,REAL_8BPP_NORMAL_FIRST); if (formats.present.count(format) > 0) { IssueMessage(0,REAL_DUPLICATE_ZOOM); return COMMENTOFF(); } formats.present.insert(format); } else {