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

Fix crates and barrels "stealing" the items from other containers when they are pushed over them

Browse Source 
Fix stone blocks disappearing when pushed
This commit is contained in:
Celtic Minstrel
2015-06-06 23:23:45 -04:00
parent 58fbf3b287
commit 722f670e3d
14 changed files with 62 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/classes/item.cpp
View File

@@ -96,7 +96,7 @@ cItem::cItem(){
item_loc.x = 0;
item_loc.y = 0;
treas_class = 0;
ident = property = magic = contained = false;
ident = property = magic = contained = held = false;
cursed = concealed = enchanted = unsellable = false;
}
@@ -923,7 +923,7 @@ void cItem::append(legacy::item_record_type& old){
contained = old.item_properties & 8;
cursed = old.item_properties & 16;
concealed = old.item_properties & 32;
enchanted = false;
enchanted = held = false;
unsellable = old.item_properties & 16;
// Set missile, if needed
if(variety == eItemType::ARROW || variety == eItemType::BOLTS) {
@@ -1273,6 +1273,7 @@ void cItem::writeTo(std::ostream& file, std::string prefix) const {
if(property) file << prefix << "PROPERTY\n";
if(magic) file << prefix << "MAGIC\n";
if(contained) file << prefix << "CONTAINED\n";
if(held) file << prefix << "HELD\n";
if(cursed) file << prefix << "CURSED\n";
if(concealed) file << prefix << "CONCEALED\n";
if(enchanted) file << prefix << "ENCHANTED\n";
@@ -1309,6 +1310,7 @@ void cItem::readFrom(std::istream& sin){
else if(cur == "PROPERTY") property = true;
else if(cur == "MAGIC") magic = true;
else if(cur == "CONTAINED") contained = true;
else if(cur == "HELD") held = true;
else if(cur == "CURSED") cursed = true;
else if(cur == "CONCEALED") concealed = true;
else if(cur == "ENCHANTED") enchanted = true;

2
src/classes/item.h
View File

@@ -43,7 +43,7 @@ public:
std::string full_name;
std::string name;
unsigned int treas_class;
bool ident, property, magic, contained, cursed, concealed, enchanted, unsellable;
bool ident, property, magic, contained, held, cursed, concealed, enchanted, unsellable;
std::string desc;
unsigned char rec_treas_class() const;
short item_weight() const;

1
src/classes/pc.cpp
View File

@@ -454,6 +454,7 @@ bool cPlayer::give_item(cItem item, bool do_print, bool allow_overload) {
else {
item.property = false;
item.contained = false;
item.held = false;
items[free_space] = item;
if(do_print && print_result) {