Merge pull request #2039 from AJenbo/ObjTypeConv

Use enums in the ObjTypeConv map

Source/objdat.cpp

@@ -1,120 +1,120 @@
 #include "all.h"
 
 /** Maps from dun_object_id to object_id. */
-int ObjTypeConv[113] = {
+int ObjTypeConv[] = {
-	0,
+	OBJ_L1LIGHT,
-	4,
+	OBJ_LEVER,
-	20,
+	OBJ_CRUX1,
-	21,
+	OBJ_CRUX2,
-	22,
+	OBJ_CRUX3,
-	24,
+	OBJ_ANGEL,
-	11,
+	OBJ_BANNERL,
-	12,
+	OBJ_BANNERM,
-	13,
+	OBJ_BANNERR,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	25,
+	OBJ_BOOK2L,
-	41,
+	OBJ_BOOK2R,
-	26,
+	OBJ_BCROSS,
-	0,
+	OBJ_L1LIGHT,
-	8,
+	OBJ_CANDLE1,
-	9,
+	OBJ_CANDLE2,
-	10,
+	OBJ_CANDLEO,
-	80,
+	OBJ_CAULDRON,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	49,
+	OBJ_GOATSHRINE,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	84,
+	OBJ_MCIRCLE1,
-	85,
+	OBJ_MCIRCLE2,
-	3,
+	OBJ_SKFIRE,
-	14,
+	OBJ_SKPILE,
-	15,
+	OBJ_SKSTICK1,
-	16,
+	OBJ_SKSTICK2,
-	17,
+	OBJ_SKSTICK3,
-	18,
+	OBJ_SKSTICK4,
-	19,
+	OBJ_SKSTICK5,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	28,
+	OBJ_SWITCHSKL,
-	0,
+	OBJ_L1LIGHT,
-	53,
+	OBJ_TRAPL,
-	54,
+	OBJ_TRAPR,
-	36,
+	OBJ_TORTURE1,
-	37,
+	OBJ_TORTURE2,
-	38,
+	OBJ_TORTURE3,
-	39,
+	OBJ_TORTURE4,
-	40,
+	OBJ_TORTURE5,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	27,
+	OBJ_NUDEW2R,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	29,
+	OBJ_TNUDEM1,
-	30,
+	OBJ_TNUDEM2,
-	31,
+	OBJ_TNUDEM3,
-	32,
+	OBJ_TNUDEM4,
-	33,
+	OBJ_TNUDEW1,
-	34,
+	OBJ_TNUDEW2,
-	35,
+	OBJ_TNUDEW3,
-	5,
+	OBJ_CHEST1,
-	5,
+	OBJ_CHEST1,
-	5,
+	OBJ_CHEST1,
-	6,
+	OBJ_CHEST2,
-	6,
+	OBJ_CHEST2,
-	6,
+	OBJ_CHEST2,
-	7,
+	OBJ_CHEST3,
-	7,
+	OBJ_CHEST3,
-	7,
+	OBJ_CHEST3,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	73,
+	OBJ_PEDISTAL,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	83,
+	OBJ_ALTBOY,
-	0,
+	OBJ_L1LIGHT,
-	0,
+	OBJ_L1LIGHT,
-	89,
+	OBJ_WARARMOR,
-	90,
+	OBJ_WARWEAP,
-	47,
+	OBJ_TORCHR2,
-	46,
+	OBJ_TORCHL2,
-	94
+	OBJ_MUSHPATCH,
 };
 
 /** Contains the data related to each object ID. */

Source/objdat.h

@@ -2,7 +2,7 @@
 #ifndef __OBJDAT_H__
 #define __OBJDAT_H__
 
-extern int ObjTypeConv[113];
+extern int ObjTypeConv[];
 extern ObjDataStruct AllObjects[99];
 extern char *ObjMasterLoadList[56];