Commit 708e0fb8 authored by sirjorj's avatar sirjorj

new stuff and better c++17 support

parent 9333b190
Subproject commit db14ad0865b3f0100b6c8e7b180b6b4207fa5a57
Subproject commit 9702c74cf8e11cc7e575b08c06be12781817f8ff
Subproject commit b9fa951398541136dba4e7774e0b0e4714dec625
Subproject commit 68671b9c7d1063e25950ab055f5b480ab8285917
......@@ -170,7 +170,6 @@ void ships2(struct kreq *req) {
case Dif::Blue: vas += "B"; break;
default: break;
}
mc++;
}
ships[pc]["maneuvers"]["xwvassal"] = vas;
......
......@@ -148,7 +148,7 @@ void upgrade(struct kreq *req) {
int sides = upgrade.IsDualSided() ? 2 : 1;
for(int i=0; i<sides; i++) {
khtml_attr(&r, KELEM_DIV, KATTR_CLASS, "ucUpgrade", KATTR__MAX);
bool hasAttack = upgrade.GetAttackStats() != std::experimental::nullopt;
bool hasAttack = upgrade.GetAttackStats() != std::nullopt;
khtml_attr(&r, KELEM_DIV, KATTR_CLASS, hasAttack ? "ucNameA" : "ucName", KATTR__MAX);
if(upgrade.IsUnique()) {
khtml_attr(&r, KELEM_SPAN, KATTR_CLASS, "iconGlyph", KATTR__MAX); khtml_puts(&r, IconGlyph::GetGlyph(Ico::unique).c_str()); khtml_closeelem(&r, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment