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

Strictify item variety enum

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-01 14:08:00 -05:00
parent f0ededde17
commit 3a1de0c890
27 changed files with 351 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osx/scenedit/scen.actions.cpp
View File

@@ -569,8 +569,8 @@ bool handle_action(location the_point,sf::Event event) {
town->preset_items[x].loc.y = spot_hit.y;
town->preset_items[x].code = mode_count;
town->preset_items[x].ability = -1;
if ((scenario.scen_items[mode_count].variety == 3) ||
(scenario.scen_items[mode_count].variety == 11))
if ((scenario.scen_items[mode_count].variety == eItemType::GOLD) ||
(scenario.scen_items[mode_count].variety == eItemType::FOOD))
town->preset_items[x].ability = get_ran(1,4,6);
//town.preset_items[x].charges = 0;
town->preset_items[x].always_there = 0;
@@ -2904,7 +2904,7 @@ bool place_item(location spot_hit,short which_item,short property,short always,s
if ((which_item < 0) || (which_item > 399))
return true;
if (scenario.scen_items[which_item].variety == 0)
if (scenario.scen_items[which_item].variety == eItemType::NO_ITEM)
return true;
if (get_ran(1,1,100) > odds)
return false;
@@ -2914,8 +2914,8 @@ bool place_item(location spot_hit,short which_item,short property,short always,s
town->preset_items[x].loc.y = spot_hit.y;
town->preset_items[x].code = which_item;
town->preset_items[x].ability = -1;
if ((scenario.scen_items[which_item].variety == 3) ||
(scenario.scen_items[which_item].variety == 11))
if ((scenario.scen_items[which_item].variety == eItemType::GOLD) ||
(scenario.scen_items[which_item].variety == eItemType::FOOD))
town->preset_items[x].ability = get_ran(1,4,6);
//town.preset_items[x].charges = 0;