From f1f256bac729fe0d5ae1f60a99db0860da7c674f Mon Sep 17 00:00:00 2001
From: Pedro Cruz <phac@cin.ufpe.br>
Date: Tue, 27 Aug 2024 21:23:41 -0300
Subject: [PATCH] fix: loading of fluid items (#116)

This fixes the loading of fluid items.
---
 data/items/items.xml | 4 +++-
 source/items.cpp     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/data/items/items.xml b/data/items/items.xml
index 9fdc89bb..675fd97d 100644
--- a/data/items/items.xml
+++ b/data/items/items.xml
@@ -20,7 +20,9 @@
 	<item id="16" name="mead"/>
 	<item id="17" name="tea"/>
 	<item id="18" name="ink"/>
-	<!-- 12.85 last fluid is 18, 19+ is a loop from 0 to 18 over and over again -->
+	<item id="19" name="candyfluid"/>
+	<item id="20" name="chocolate"/>
+	<!-- 13.40 last fluid is 20, 21+ is a loop from 0 to 20 over and over again -->
 
 	<item id="100" name="void"/>
 	<item id="101" name="earth"/>
diff --git a/source/items.cpp b/source/items.cpp
index 245cd6eb..92de5481 100644
--- a/source/items.cpp
+++ b/source/items.cpp
@@ -546,8 +546,8 @@ bool ItemDatabase::loadItemFromGameXml(pugi::xml_node itemNode, uint16_t id) {
 		return true;
 	}
 
-	// Não verificar isValidID se o ID estiver entre 1 e 18, mas verificar para outros IDs.
-	if (!(id >= 1 && id <= 18) && !isValidID(id)) {
+	// Não verificar isValidID se o ID estiver entre LIQUID_FIRST e LIQUID_LAST, mas verificar para outros IDs.
+	if (!(id >= LIQUID_FIRST && id <= LIQUID_LAST) && !isValidID(id)) {
 		return false;
 	}