Fix rebase errors

This commit is contained in:
Duncan Frost 2015-03-22 19:58:45 +00:00
parent 862b7546e9
commit 3618b354b4
1 changed files with 1 additions and 1 deletions

View File

@ -3677,7 +3677,7 @@ static int peep_update_patrolling_find_watering(rct_peep* peep){
rct_scenery_entry* sceneryEntry = g_smallSceneryEntries[map_element->properties.scenery.type];
if (!(sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG7)){
if (!(sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_CAN_BE_WATERED)){
map_element++;
continue;
}