From fc06bedef3f5521a97989ebb6c7160744c640a19 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Change set_type to non-POD type --- src/set_type.hpp | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'src/set_type.hpp') diff --git a/src/set_type.hpp b/src/set_type.hpp index 827c23ac..0a04b384 100644 --- a/src/set_type.hpp +++ b/src/set_type.hpp @@ -1,28 +1,18 @@ #pragma once -#include "h-basic.h" +#include +#include "set_component.hpp" /** * Item set descriptor and runtime information. */ struct set_type { - const char *name; /* Name */ - char *desc; /* Desc */ + const char *name = nullptr; /* Name */ + char *desc = nullptr; /* Desc */ - byte num; /* Number of artifacts used */ - byte num_use; /* Number actually wore */ + byte num = 0; /* Number of artifacts used */ + byte num_use = 0; /* Number actually worn */ - struct /* the various items */ - { - bool_ present; /* Is it actually wore ? */ - s16b a_idx; /* What artifact ? */ - s16b pval[6]; /* Pval for each combination */ - u32b flags1[6]; /* Flags */ - u32b flags2[6]; /* Flags */ - u32b flags3[6]; /* Flags */ - u32b flags4[6]; /* Flags */ - u32b flags5[6]; /* Flags */ - u32b esp[6]; /* Flags */ - } arts[6]; + std::array arts; }; -- cgit v1.2.3 From 0cea35759ed072d3a42b54926d6fee7d12346418 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Change set_type name/desc to std::string --- src/set_type.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/set_type.hpp') diff --git a/src/set_type.hpp b/src/set_type.hpp index 0a04b384..bf13c932 100644 --- a/src/set_type.hpp +++ b/src/set_type.hpp @@ -1,6 +1,8 @@ #pragma once #include +#include + #include "set_component.hpp" /** @@ -8,8 +10,8 @@ */ struct set_type { - const char *name = nullptr; /* Name */ - char *desc = nullptr; /* Desc */ + std::string name; /* Name */ + std::string desc; /* Desc */ byte num = 0; /* Number of artifacts used */ byte num_use = 0; /* Number actually worn */ -- cgit v1.2.3