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

Fix Windows build

Browse Source 
This commit also disables warnings for comparison of differently signed integers
This commit is contained in:
Celtic Minstrel
2015-02-12 18:21:58 -05:00
parent b3b72f648c
commit d45ba59cce
16 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scenedit/scen.core.cpp
View File

@@ -2064,7 +2064,7 @@ static bool put_shop_item_in_dlog(cPict& pic, cControl& num, cControl& title, co
}
std::string name = entry.item.full_name;
int amount = entry.quantity;
if(entry.type == eShopItemType::OPTIONAL) {
if(entry.type == eShopItemType::OPT_ITEM) {
name += " [" + std::to_string(amount / 1000) + "% chance]";
amount %= 1000;
}
@@ -2240,8 +2240,8 @@ static bool edit_shop_entry(cDialog& me, std::string which, cShop& shop) {
switch(entry.type) {
case eShopItemType::EMPTY: return true;
case eShopItemType::ITEM:
case eShopItemType::OPTIONAL:
edit_shop_item(me, entry.index, entry.quantity, entry.type == eShopItemType::OPTIONAL);
case eShopItemType::OPT_ITEM:
edit_shop_item(me, entry.index, entry.quantity, entry.type == eShopItemType::OPT_ITEM);
entry.item = scenario.scen_items[entry.index];
shop.replaceItem(i, entry);
need_string = false;

2
src/scenedit/scen.fileio.cpp
View File

@@ -230,7 +230,7 @@ static void writeScenarioToXml(ticpp::Printer&& data) {
int quantity = entry.quantity, chance = 100;
switch(entry.type) {
case eShopItemType::EMPTY: break;
case eShopItemType::OPTIONAL:
case eShopItemType::OPT_ITEM:
quantity %= 1000;
chance = entry.quantity / 1000;
case eShopItemType::ITEM: