From 2477d956e9af74dee976fba363871fb23d648cb6 Mon Sep 17 00:00:00 2001 From: Chance4us Date: Fri, 16 Oct 2020 22:51:32 +0200 Subject: [PATCH 1/2] [hellfire] correct the name for barrels --- Source/objects.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/objects.cpp b/Source/objects.cpp index f3ab6e1e8..9e032130e 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -5261,6 +5261,13 @@ void GetObjectStr(int i) break; case OBJ_BARREL: case OBJ_BARRELEX: + #ifdef HELLFIRE + if (currlevel > 16 && currlevel < 21) // for hive levels + strcpy(infostr, "Pod"); //Then a barrel is called a pod + else if (currlevel > 20 && currlevel < 25) // for crypt levels + strcpy(infostr, "Urn"); //Then a barrel is called an urn + else + #endif strcpy(infostr, "Barrel"); break; case OBJ_SKELBOOK: From 5e535c43bb6418e7d86cee4dcece46e46e72aa5e Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 16 Oct 2020 23:50:21 +0200 Subject: [PATCH 2/2] Update Source/objects.cpp --- Source/objects.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/objects.cpp b/Source/objects.cpp index 9e032130e..29b7b977e 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -5261,13 +5261,13 @@ void GetObjectStr(int i) break; case OBJ_BARREL: case OBJ_BARRELEX: - #ifdef HELLFIRE +#ifdef HELLFIRE if (currlevel > 16 && currlevel < 21) // for hive levels strcpy(infostr, "Pod"); //Then a barrel is called a pod else if (currlevel > 20 && currlevel < 25) // for crypt levels strcpy(infostr, "Urn"); //Then a barrel is called an urn else - #endif +#endif strcpy(infostr, "Barrel"); break; case OBJ_SKELBOOK: