From fcf0c0f81d0c0f197e9a61e886005da666eea48d Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 19 Sep 2020 15:44:49 +0200 Subject: [PATCH] Add right facing bookcase for mapping --- Source/objdat.cpp | 4 +++- Source/objdat.h | 2 +- enums.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/objdat.cpp b/Source/objdat.cpp index 3d709cead..bd3513ae2 100644 --- a/Source/objdat.cpp +++ b/Source/objdat.cpp @@ -142,10 +142,11 @@ int ObjTypeConv[] = { OBJ_TCHEST3, OBJ_LAZSTAND, OBJ_BOOKSTAND, + OBJ_BOOKSHELFR, }; /** Contains the data related to each object ID. */ -ObjDataStruct AllObjects[99] = { +ObjDataStruct AllObjects[] = { // clang-format off // oload, ofindex, ominlvl, omaxlvl, olvltype, otheme, oquest, oAnimFlag, oAnimDelay, oAnimLen, oAnimWidth, oSolidFlag, oMissFlag, oLightFlag, oBreak, oSelFlag, oTrapFlag { 1, OFILE_L1BRAZ, 1, 4, DTYPE_CATHEDRAL, THEME_NONE, -1, 1, 1, 26, 64, TRUE, TRUE, FALSE, 0, 0, FALSE }, @@ -246,6 +247,7 @@ ObjDataStruct AllObjects[99] = { { 2, OFILE_LZSTAND, 0, 0, DTYPE_TOWN, THEME_NONE, Q_BETRAYER, 0, 1, 0, 128, TRUE, FALSE, TRUE, 0, 3, FALSE }, { 1, OFILE_DECAP, 9, 9, DTYPE_CAVES, THEME_NONE, -1, 0, 2, 0, 96, TRUE, TRUE, TRUE, 0, 1, FALSE }, { 2, OFILE_CHEST3, 0, 0, DTYPE_TOWN, THEME_NONE, -1, 0, 1, 0, 96, TRUE, TRUE, TRUE, 0, 1, TRUE }, + { 2, OFILE_BCASE, 0, 0, 0, THEME_NONE, -1, 0, 2, 0, 96, TRUE, FALSE, TRUE, 0, 0, FALSE }, { -1, 0, 0, 0, -1, THEME_NONE, -1, 0, 0, 0, 0, FALSE, FALSE, FALSE, 0, 0, FALSE } // clang-format on }; diff --git a/Source/objdat.h b/Source/objdat.h index a0f00b09c..291b0ecb0 100644 --- a/Source/objdat.h +++ b/Source/objdat.h @@ -9,7 +9,7 @@ extern "C" { #endif extern int ObjTypeConv[]; -extern ObjDataStruct AllObjects[99]; +extern ObjDataStruct AllObjects[]; extern char *ObjMasterLoadList[56]; #ifdef __cplusplus diff --git a/enums.h b/enums.h index c400de1fc..7985a1b1c 100644 --- a/enums.h +++ b/enums.h @@ -2427,7 +2427,7 @@ typedef enum _object_id { OBJ_LAZSTAND = 0x5F, OBJ_SLAINHERO = 0x60, OBJ_SIGNCHEST = 0x61, - OBJ_NULL_98 = 0x62, + OBJ_BOOKSHELFR = 0x62, } _object_id; typedef enum item_misc_id {