From 493333206ea94eb0592e52629a0a628fa34eb266 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 29 Mar 2016 20:32:55 +0200 Subject: Change dungeon_info_type to non-POD type --- src/rule_type.hpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/rule_type.hpp') diff --git a/src/rule_type.hpp b/src/rule_type.hpp index a8b35ffa..d2e510a7 100644 --- a/src/rule_type.hpp +++ b/src/rule_type.hpp @@ -5,18 +5,18 @@ /* Define monster generation rules */ struct rule_type { - byte mode; /* Mode of combination of the monster flags */ - byte percent; /* Percent of monsters affected by the rule */ + byte mode = 0; /* Mode of combination of the monster flags */ + byte percent = 0; /* Percent of monsters affected by the rule */ - u32b mflags1; /* The monster flags that are allowed */ - u32b mflags2; - u32b mflags3; - u32b mflags4; - u32b mflags5; - u32b mflags6; - u32b mflags7; - u32b mflags8; - u32b mflags9; + u32b mflags1 = 0; /* The monster flags that are allowed */ + u32b mflags2 = 0; + u32b mflags3 = 0; + u32b mflags4 = 0; + u32b mflags5 = 0; + u32b mflags6 = 0; + u32b mflags7 = 0; + u32b mflags8 = 0; + u32b mflags9 = 0; - char r_char[5]; /* Monster race allowed */ + char r_char[5] = { 0 }; /* Monster race allowed */ }; -- cgit v1.2.3 From 59b5314b6b7880cfda73f34aed03a700fd523017 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Rework RF{4,5,6}_* monster spell flags to flag_set<> --- src/rule_type.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/rule_type.hpp') diff --git a/src/rule_type.hpp b/src/rule_type.hpp index d2e510a7..d6424641 100644 --- a/src/rule_type.hpp +++ b/src/rule_type.hpp @@ -1,6 +1,7 @@ #pragma once #include "h-basic.h" +#include "monster_spell_flag_set.hpp" /* Define monster generation rules */ struct rule_type @@ -11,12 +12,11 @@ struct rule_type u32b mflags1 = 0; /* The monster flags that are allowed */ u32b mflags2 = 0; u32b mflags3 = 0; - u32b mflags4 = 0; - u32b mflags5 = 0; - u32b mflags6 = 0; u32b mflags7 = 0; u32b mflags8 = 0; u32b mflags9 = 0; + monster_spell_flag_set mspells; /* Monster spells the are allowed */ + char r_char[5] = { 0 }; /* Monster race allowed */ }; -- cgit v1.2.3 From 68e2a10b2d76cb3a2f5aa6818b4b184b6a02ef14 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Rework RF{1,2,3,7,8,9}_* monster flags to use flag_set<> --- src/rule_type.hpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/rule_type.hpp') diff --git a/src/rule_type.hpp b/src/rule_type.hpp index d6424641..b88ce7bf 100644 --- a/src/rule_type.hpp +++ b/src/rule_type.hpp @@ -1,6 +1,7 @@ #pragma once #include "h-basic.h" +#include "monster_race_flag_set.hpp" #include "monster_spell_flag_set.hpp" /* Define monster generation rules */ @@ -9,13 +10,7 @@ struct rule_type byte mode = 0; /* Mode of combination of the monster flags */ byte percent = 0; /* Percent of monsters affected by the rule */ - u32b mflags1 = 0; /* The monster flags that are allowed */ - u32b mflags2 = 0; - u32b mflags3 = 0; - u32b mflags7 = 0; - u32b mflags8 = 0; - u32b mflags9 = 0; - + monster_race_flag_set mflags; /* The monster flags that are allowed */ monster_spell_flag_set mspells; /* Monster spells the are allowed */ char r_char[5] = { 0 }; /* Monster race allowed */ -- cgit v1.2.3