<ClInclude Include="..\..\src\object\object-util.h" />\r
<ClInclude Include="..\..\src\object\old-ego-extra-values.h" />\r
<ClInclude Include="..\..\src\object\special-object-flags.h" />\r
+ <ClInclude Include="..\..\src\object\sv-amulet-types.h" />\r
<ClInclude Include="..\..\src\object\sv-armor-types.h" />\r
<ClInclude Include="..\..\src\object\sv-bow-types.h" />\r
<ClInclude Include="..\..\src\object\sv-digging-types.h" />\r
<ClInclude Include="..\..\src\object\sv-lite-types.h">
<Filter>object</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\object\sv-amulet-types.h">
+ <Filter>object</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\wall.bmp" />
object/old-ego-extra-values.h object/special-object-flags.h \
object/object-mark-types.h object/object-util.h \
object/item-apply-magic.h \
- object/sv-bow-types.h object/sv-digging-types.h \
+ object/sv-amulet-types.h object/sv-bow-types.h \
+ object/sv-digging-types.h \
object/sv-weapon-types.h object/sv-protector-types.h object/sv-armor-types.h \
object/sv-lite-types.h object/sv-potion-types.h object/sv-ring-types.h \
object/sv-other-types.h \
#include "player/player-effects.h"
#include "object/object-kind.h"
#include "object/object-ego.h"
+#include "object/sv-amulet-types.h"
#include "object/sv-protector-types.h"
#include "cmd-dump.h"
#include "view/display-main-window.h"
#include "floor/floor-town.h"
#include "object/object-hook.h"
#include "object/object-kind.h"
+#include "object/sv-amulet-types.h"
#include "object/sv-protector-types.h"
#include "object/tr-types.h"
#include "system/angband.h"
#include "arena-info-table.h"
+#include "object/sv-amulet-types.h"
#include "object/sv-potion-types.h"
#include "object/sv-ring-types.h"
#include "system/angband.h"
#include "store/store-owners.h"
#include "articles-on-sale.h"
+#include "object/sv-amulet-types.h"
#include "object/sv-armor-types.h"
#include "object/sv-bow-types.h"
#include "object/sv-digging-types.h"
#include "system/angband.h"
#include "object/object-kind-hook.h"
#include "object/object-kind.h"
+#include "object/sv-amulet-types.h"
#include "object/sv-ring-types.h"
/*
#include "object/object-flavor.h"
#include "object/object-hook.h"
#include "object/special-object-flags.h"
+#include "object/sv-amulet-types.h"
#include "object/sv-lite-types.h"
#include "object/sv-other-types.h"
#include "object/sv-ring-types.h"
extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds);
extern void torch_lost_fuel(object_type *o_ptr);
-/* The "sval" codes for TV_AMULET */
-#define SV_AMULET_DOOM 0
-#define SV_AMULET_TELEPORT 1
-#define SV_AMULET_ADORNMENT 2
-#define SV_AMULET_SLOW_DIGEST 3
-#define SV_AMULET_RESIST_ACID 4
-#define SV_AMULET_SEARCHING 5
-#define SV_AMULET_BRILLIANCE 6
-#define SV_AMULET_CHARISMA 7
-#define SV_AMULET_THE_MAGI 8
-#define SV_AMULET_REFLECTION 9
-#define SV_AMULET_CARLAMMAS 10
-#define SV_AMULET_INGWE 11
-#define SV_AMULET_DWARVES 12
-#define SV_AMULET_NO_MAGIC 13
-#define SV_AMULET_NO_TELE 14
-#define SV_AMULET_RESISTANCE 15
-#define SV_AMULET_TELEPATHY 16
-#define SV_AMULET_FARAMIR 17
-#define SV_AMULET_BOROMIR 18
-#define SV_AMULET_MAGATAMA 19
-#define SV_AMULET_INROU 20
-#define SV_AMULET_INTELLIGENCE 21
-#define SV_AMULET_WISDOM 22
-#define SV_AMULET_MAGIC_MASTERY 23
-#define SV_AMULET_NIGHT 24
-
/* The "sval" codes for TV_STAFF */
#define SV_STAFF_DARKNESS 0
#define SV_STAFF_SLOWNESS 1
#include "object/object-mark-types.h"
#include "object/artifact.h"
#include "object/special-object-flags.h"
+#include "object/sv-amulet-types.h"
#include "object/sv-armor-types.h"
#include "object/sv-bow-types.h"
#include "object/sv-lite-types.h"
--- /dev/null
+#pragma once
+
+/* The "sval" codes for TV_AMULET */
+typedef enum sv_amulet_type {
+ SV_AMULET_DOOM = 0,
+ SV_AMULET_TELEPORT = 1,
+ SV_AMULET_ADORNMENT = 2,
+ SV_AMULET_SLOW_DIGEST = 3,
+ SV_AMULET_RESIST_ACID = 4,
+ SV_AMULET_SEARCHING = 5,
+ SV_AMULET_BRILLIANCE = 6,
+ SV_AMULET_CHARISMA = 7,
+ SV_AMULET_THE_MAGI = 8,
+ SV_AMULET_REFLECTION = 9,
+ SV_AMULET_CARLAMMAS = 10,
+ SV_AMULET_INGWE = 11,
+ SV_AMULET_DWARVES = 12,
+ SV_AMULET_NO_MAGIC = 13,
+ SV_AMULET_NO_TELE = 14,
+ SV_AMULET_RESISTANCE = 15,
+ SV_AMULET_TELEPATHY = 16,
+ SV_AMULET_FARAMIR = 17,
+ SV_AMULET_BOROMIR = 18,
+ SV_AMULET_MAGATAMA = 19,
+ SV_AMULET_INROU = 20,
+ SV_AMULET_INTELLIGENCE = 21,
+ SV_AMULET_WISDOM = 22,
+ SV_AMULET_MAGIC_MASTERY = 23,
+ SV_AMULET_NIGHT = 24,
+} sv_amulet_type;