Merge pull request #2039 from AJenbo/ObjTypeConv

Use enums in the ObjTypeConv map
6 years ago · 32ba38a33a
2 changed files with 115 additions and 115 deletions
--- a/Source/objdat.cpp
+++ b/Source/objdat.cpp
@ -1,120 +1,120 @@
 #include "all.h"

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

 /** Contains the data related to each object ID. */
--- a/Source/objdat.h
+++ b/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];