From c80475f7dbf9cc07946b92e9d6908eb996eb2da2 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Thu, 2 Jul 2015 19:25:04 +0100 Subject: [PATCH] allow disable clearance checks for footpaths --- data/language/english_uk.txt | 3 +++ src/localisation/string_ids.h | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 2fdada2e4f..f32156e242 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -3791,6 +3791,7 @@ STR_5454 :Uncap FPS STR_5455 :Enable sandbox mode STR_5456 :Disable clearance checks STR_5457 :Disable support limits +<<<<<<< HEAD STR_5458 :Rotate clockwise STR_5459 :Rotate anti-clockwise STR_5460 :Rotate view anti-clockwise @@ -3800,3 +3801,5 @@ STR_5463 :Goal: Have fun! STR_5464 :General STR_5465 :Climate STR_5466 :Staff +======= +>>>>>>> allow disable clearance checks for footpaths diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index f40045cd55..e367ce7d39 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1774,6 +1774,13 @@ enum { STR_SHORTCUT_TOGGLE_VISIBILITY_OF_TOOLBARS = 5452, STR_SELECT_OTHER_RIDE = 5453, + + STR_ENABLE_SANDBOX_MODE = 5455, + STR_DISABLE_CLEARANCE_CHECKS = 5456, + STR_DISABLE_SUPPORT_LIMITS = 5457, + + STR_SHORTCUT_ROTATE_VIEW_ANTICLOCKWISE = 5460, + STR_CHEAT_SET_GUESTS_PARAMETERS = 5461, STR_CHEAT_CURRENCY_FORMAT = 5462, STR_CHEAT_HAVE_FUN = 5463, @@ -1781,12 +1788,6 @@ enum { STR_CHEAT_CLIMATE_GROUP = 5465, STR_CHEAT_STAFF_GROUP = 5466, - STR_SHORTCUT_ROTATE_VIEW_ANTICLOCKWISE = 5460, - - STR_ENABLE_SANDBOX_MODE = 5455, - STR_DISABLE_CLEARANCE_CHECKS = 5456, - STR_DISABLE_SUPPORT_LIMITS = 5457, - // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 };