snakert12345/yupplemayham
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Decided to just implement auto it reload since it feels better on the player end. Also added much needed logging for tileset loading

Browse source
This commit is contained in:
Ethan Adams 2025-02-27 13:46:10 -05:00
parent ff8bcf3480
commit 02403b142a
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
YuppleMayham/src/gameplay/weapons/weapon.cpp
View file

@ -94,7 +94,8 @@ bool Weapon::shoot()
sol::error err = result; sol::error err = result;
std::cerr << "lua error: " << err.what() << std::endl; std::cerr << "lua error: " << err.what() << std::endl;
} }
weaponMag -= 1; // auto reload
if ((weaponMag -= 1) <= 0) reload();
} }
} }
else if (weaponMag <= 0) reload(); else if (weaponMag <= 0) reload();

21
YuppleMayham/src/utility/xmlloader.cpp
View file

@ -440,12 +440,21 @@ bool XMLLoader::loadTile(tinyxml2::XMLElement* tileElement, TileSetData::TileDat
Notice we just return true if there is no property, we can just safely default to walkable = true Notice we just return true if there is no property, we can just safely default to walkable = true
*/ */
tinyxml2::XMLElement* properties = tileElement->FirstChildElement("properties"); tinyxml2::XMLElement* properties = tileElement->FirstChildElement("properties");
if (properties == NULL) if (properties == NULL) {
return true; LOG(WARN, "No properties found on tile id: {} assuming defaults", tileData.id);
tinyxml2::XMLElement* propWalk = properties->FirstChildElement("property"); } else {
if (propWalk == NULL || !propWalk->Attribute("name", "walkable")) tinyxml2::XMLElement* propWalk = properties->FirstChildElement("property");
return true; if (propWalk == NULL) {
propWalk->QueryBoolAttribute("value", &tileData.walkable); LOG(WARN, "No walkable propery found on tile id: {} assuming walkable", tileData.id);
} else {
for (auto& prop = propWalk; prop != NULL; prop = prop->NextSiblingElement()) {
if (prop->Attribute("name", "walkable")) {
prop->QueryBoolAttribute("value", &tileData.walkable);
break;
}
}
}
}
} }
tileData.type = tileType; tileData.type = tileType;