openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

const-correctness in scenario classes

Browse Source
This commit is contained in:
Celtic Minstrel
2023-01-22 17:25:16 -05:00
parent cd8f73344f
commit 9931ef8ffe
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scenario/outdoors.cpp
View File

@@ -195,7 +195,7 @@ void cOutdoors::cWandering::readFrom(const cTagFile_Page& page){
std::copy_n(temp.begin(), friendly.size(), friendly.begin()); std::copy_n(temp.begin(), friendly.size(), friendly.begin());
} }
bool cOutdoors::cWandering::isNull(){ bool cOutdoors::cWandering::isNull() const {
for(short i = 0; i < 7; i++) for(short i = 0; i < 7; i++)
if(monst[i] != 0) if(monst[i] != 0)
return false; return false;

2
src/scenario/outdoors.hpp
View File

@@ -45,7 +45,7 @@ public:
short end_spec1,end_spec2; short end_spec1,end_spec2;
bool cant_flee, forced; bool cant_flee, forced;
bool isNull(); bool isNull() const;
void import_legacy(legacy::out_wandering_type old); void import_legacy(legacy::out_wandering_type old);
void writeTo(cTagFile_Page& page) const; void writeTo(cTagFile_Page& page) const;
void readFrom(const cTagFile_Page& page); void readFrom(const cTagFile_Page& page);

22
src/scenario/scenario.cpp
View File

@@ -304,19 +304,19 @@ static std::string format_version(const unsigned char(& ver)[3]) {
return fmt.str(); return fmt.str();
} }
std::string cScenario::format_ed_version() { std::string cScenario::format_ed_version() const {
return format_version(format.prog_make_ver); return format_version(format.prog_make_ver);
} }
std::string cScenario::format_scen_version() { std::string cScenario::format_scen_version() const {
return format_version(format.ver); return format_version(format.ver);
} }
ter_num_t cScenario::get_ground_from_ter(ter_num_t ter){ ter_num_t cScenario::get_ground_from_ter(ter_num_t ter) const {
return get_ter_from_ground(ter_types[ter].ground_type); return get_ter_from_ground(ter_types[ter].ground_type);
} }
ter_num_t cScenario::get_ter_from_ground(unsigned short ground){ ter_num_t cScenario::get_ter_from_ground(unsigned short ground) const {
ter_num_t archetype = -1; ter_num_t archetype = -1;
for(int i = 0; i < ter_types.size(); i++) for(int i = 0; i < ter_types.size(); i++)
if(ter_types[i].ground_type == ground) { if(ter_types[i].ground_type == ground) {
@@ -328,7 +328,7 @@ ter_num_t cScenario::get_ter_from_ground(unsigned short ground){
return std::max(archetype, ter_num_t()); return std::max(archetype, ter_num_t());
} }
ter_num_t cScenario::get_trim_terrain(unsigned short ground, unsigned short trim_g, eTrimType trim) { ter_num_t cScenario::get_trim_terrain(unsigned short ground, unsigned short trim_g, eTrimType trim) const {
for(int i = 0; i < ter_types.size(); i++) { for(int i = 0; i < ter_types.size(); i++) {
if(ter_types[i].ground_type != ground) if(ter_types[i].ground_type != ground)
continue; continue;
@@ -341,7 +341,7 @@ ter_num_t cScenario::get_trim_terrain(unsigned short ground, unsigned short trim
return 90; return 90;
} }
bool cScenario::is_ter_used(ter_num_t ter) { bool cScenario::is_ter_used(ter_num_t ter) const {
if(ter >= ter_types.size()) return false; if(ter >= ter_types.size()) return false;
if(ter <= 90) return true; if(ter <= 90) return true;
for(int sx = 0; sx < outdoors.width(); sx++) { for(int sx = 0; sx < outdoors.width(); sx++) {
@@ -365,7 +365,7 @@ bool cScenario::is_ter_used(ter_num_t ter) {
return false; return false;
} }
bool cScenario::is_monst_used(mon_num_t monst) { bool cScenario::is_monst_used(mon_num_t monst) const {
if(monst >= scen_monsters.size()) return false; if(monst >= scen_monsters.size()) return false;
for(int sx = 0; sx < outdoors.width(); sx++) { for(int sx = 0; sx < outdoors.width(); sx++) {
for(int sy = 0; sy < outdoors.height(); sy++) { for(int sy = 0; sy < outdoors.height(); sy++) {
@@ -400,7 +400,7 @@ bool cScenario::is_monst_used(mon_num_t monst) {
return false; return false;
} }
bool cScenario::is_item_used(item_num_t item) { bool cScenario::is_item_used(item_num_t item) const {
if(item >= scen_items.size()) return false; if(item >= scen_items.size()) return false;
for(int i = 0; i < towns.size(); i++) { for(int i = 0; i < towns.size(); i++) {
for(int j = 0; j < towns[i]->preset_items.size(); j++) { for(int j = 0; j < towns[i]->preset_items.size(); j++) {
@@ -411,7 +411,7 @@ bool cScenario::is_item_used(item_num_t item) {
return false; return false;
} }
cItem cScenario::get_stored_item(int loot) { cItem cScenario::get_stored_item(int loot) const {
if(loot >= 0 && loot < scen_items.size()) if(loot >= 0 && loot < scen_items.size())
return scen_items[loot]; return scen_items[loot];
return cItem(); return cItem();
@@ -420,7 +420,7 @@ cItem cScenario::get_stored_item(int loot) {
static const short loot_min[5] = {0,0,5,50,400}; static const short loot_min[5] = {0,0,5,50,400};
static const short loot_max[5] = {3,8,40,800,4000}; static const short loot_max[5] = {3,8,40,800,4000};
cItem cScenario::pull_item_of_type(unsigned int loot_max,short min_val,short max_val, const std::vector<eItemType>& types,bool allow_junk_treasure) { cItem cScenario::pull_item_of_type(unsigned int loot_max,short min_val,short max_val, const std::vector<eItemType>& types,bool allow_junk_treasure) const {
// occasionally get nice item // occasionally get nice item
if(get_ran(1,0,160) == 80) { if(get_ran(1,0,160) == 80) {
loot_max += 2; loot_max += 2;
@@ -444,7 +444,7 @@ enum eTreasureType {
SCROLL, WAND, RING, NECKLACE, POISON, GLOVES, BOOTS, SCROLL, WAND, RING, NECKLACE, POISON, GLOVES, BOOTS,
}; };
cItem cScenario::return_treasure(int loot, bool allow_junk) { cItem cScenario::return_treasure(int loot, bool allow_junk) const {
static const std::vector<eItemType> static const std::vector<eItemType>
weapon = {eItemType::ONE_HANDED,eItemType::TWO_HANDED}, weapon = {eItemType::ONE_HANDED,eItemType::TWO_HANDED},
armor = {eItemType::ARMOR}, shield = {eItemType::SHIELD}, helm = {eItemType::HELM}, armor = {eItemType::ARMOR}, shield = {eItemType::SHIELD}, helm = {eItemType::HELM},

22
src/scenario/scenario.hpp
View File

@@ -100,21 +100,21 @@ public:
void import_legacy(legacy::scen_item_data_type& old); void import_legacy(legacy::scen_item_data_type& old);
void writeTo(cTagFile& file) const; void writeTo(cTagFile& file) const;
void readFrom(const cTagFile& file); void readFrom(const cTagFile& file);
std::string format_scen_version(); std::string format_scen_version() const;
std::string format_ed_version(); std::string format_ed_version() const;
ter_num_t get_ground_from_ter(ter_num_t ter); ter_num_t get_ground_from_ter(ter_num_t ter) const;
ter_num_t get_ter_from_ground(unsigned short ground); ter_num_t get_ter_from_ground(unsigned short ground) const;
ter_num_t get_trim_terrain(unsigned short ground, unsigned short trim_g, eTrimType trim); ter_num_t get_trim_terrain(unsigned short ground, unsigned short trim_g, eTrimType trim) const;
cOutdoors& get_sector(int x, int y); cOutdoors& get_sector(int x, int y);
bool is_town_entrance_valid(spec_loc_t loc) const; bool is_town_entrance_valid(spec_loc_t loc) const;
bool is_ter_used(ter_num_t ter); bool is_ter_used(ter_num_t ter) const;
bool is_monst_used(mon_num_t monst); bool is_monst_used(mon_num_t monst) const;
bool is_item_used(item_num_t item); bool is_item_used(item_num_t item) const;
cItem get_stored_item(int loot); cItem get_stored_item(int loot) const;
cItem return_treasure(int loot, bool allow_junk_treasure = false); cItem return_treasure(int loot, bool allow_junk_treasure = false) const;
cItem pull_item_of_type(unsigned int loot_max,short min_val,short max_val,const std::vector<eItemType>& types,bool allow_junk_treasure=false); cItem pull_item_of_type(unsigned int loot_max,short min_val,short max_val,const std::vector<eItemType>& types,bool allow_junk_treasure=false) const;
void reset_version(); void reset_version();
explicit cScenario(); explicit cScenario();

4
src/scenario/shop.cpp
View File

@@ -85,7 +85,7 @@ cShop::cShop(eShopPreset preset) {
} }
} }
size_t cShop::firstEmpty() { size_t cShop::firstEmpty() const {
for(size_t i = 0; i < items.size(); i++) { for(size_t i = 0; i < items.size(); i++) {
if(items[i].type == eShopItemType::EMPTY) if(items[i].type == eShopItemType::EMPTY)
return i; return i;
@@ -320,7 +320,7 @@ void cShop::clear() {
items.clear(); items.clear();
} }
int cShopItem::getCost(int adj) { int cShopItem::getCost(int adj) const {
int cost = item.value; int cost = item.value;
if(item.charges > 0) if(item.charges > 0)
cost *= item.charges; cost *= item.charges;

4
src/scenario/shop.hpp
View File

@@ -53,7 +53,7 @@ struct cShopItem {
eShopItemType type = eShopItemType::EMPTY; eShopItemType type = eShopItemType::EMPTY;
size_t quantity, index; size_t quantity, index;
cItem item{ITEM_SHOP}; cItem item{ITEM_SHOP};
int getCost(int adj); int getCost(int adj) const;
}; };
enum eShopPreset {SHOP_HEALING, SHOP_JUNK}; enum eShopPreset {SHOP_HEALING, SHOP_JUNK};
@@ -65,7 +65,7 @@ class cShop {
eShopType type; eShopType type;
eShopPrompt prompt; eShopPrompt prompt;
pic_num_t face; pic_num_t face;
size_t firstEmpty(); size_t firstEmpty() const;
public: public:
static const size_t INFINITE = 0; static const size_t INFINITE = 0;
cShop(); cShop();

6
src/scenario/town.cpp
View File

@@ -166,14 +166,14 @@ void cTown::cField::import_legacy(legacy::preset_field_type old){
} }
} }
bool cTown::cWandering::isNull(){ bool cTown::cWandering::isNull() const {
for(short i = 0;i < 4;i++) for(short i = 0;i < 4;i++)
if(monst[i] != 0) if(monst[i] != 0)
return false; return false;
return true; return true;
} }
bool cTown::is_cleaned_out() { bool cTown::is_cleaned_out() const {
if(max_num_monst < 0) return false; if(max_num_monst < 0) return false;
return m_killed >= max_num_monst; return m_killed >= max_num_monst;
} }
@@ -209,7 +209,7 @@ void cTown::set_up_lights() {
} }
} }
short cTown::light_obscurity(short x,short y) { short cTown::light_obscurity(short x,short y) const {
if(!is_on_map(loc(x,y))) return 5; if(!is_on_map(loc(x,y))) return 5;
ter_num_t what_terrain = this->terrain(x,y); ter_num_t what_terrain = this->terrain(x,y);
eTerObstruct store = scenario->ter_types[what_terrain].blockage; eTerObstruct store = scenario->ter_types[what_terrain].blockage;

6
src/scenario/town.hpp
View File

@@ -49,7 +49,7 @@ public:
public: public:
std::array<mon_num_t,4> monst; std::array<mon_num_t,4> monst;
bool isNull(); bool isNull() const;
void import_legacy(legacy::wandering_type old); void import_legacy(legacy::wandering_type old);
}; };
class cItem { // formerly preset_item_type class cItem { // formerly preset_item_type
@@ -107,8 +107,8 @@ public:
void import_legacy(T& old, int town_num); void import_legacy(T& old, int town_num);
void init_start(); void init_start();
void set_up_lights(); void set_up_lights();
short light_obscurity(short x,short y); // Obscurity function used for calculating lighting short light_obscurity(short x,short y) const; // Obscurity function used for calculating lighting
bool is_cleaned_out(); bool is_cleaned_out() const;
explicit cTown(cScenario& scenario, size_t dim); explicit cTown(cScenario& scenario, size_t dim);
void import_legacy(legacy::town_record_type& old); void import_legacy(legacy::town_record_type& old);