mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 14:24:33 +01:00
Code Issues Releases Wiki Activity

In C++11 use actual pointer types instead of C's defines

Browse Source 
This is mostly `NULL` -> `nullptr` in cpp files, but I only noticed
because `LanguagePack::GetObjectOverride` and
`LanguagePack::GetScenarioOverride` were returning false instead of real
pointer.

Also fixes some whitespaces, you can `w=1` to github's URL to make it
skip these.
This commit is contained in:
Michał Janiszewski
2015-09-10 08:11:00 +02:00
parent 85bbdde056
commit 17e635b8af
14 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/localisation/string_ids.h
View File

@@ -8,12 +8,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*****************************************************************************/
@@ -160,7 +160,7 @@ enum {
STR_RIDE_CONSTRUCTION_CANT_REMOVE_THIS = 926,
STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE = 927,
STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP = 928,
STR_S_BEND_LEFT = 929,
STR_S_BEND_RIGHT = 930,
STR_VERTICAL_LOOP_LEFT = 931,
@@ -175,7 +175,7 @@ enum {
STR_REMOVE_BASE_LAND = 940,
STR_REMOVE_VERTICAL_FACES = 941,
STR_SEE_THROUGH_RIDES = 942,
STR_SEE_THROUGH_SCENERY = 943,
STR_SEE_THROUGH_SCENERY = 943,
STR_SAVE_PROMPT_SAVE = 944,
STR_SAVE_PROMPT_DONT_SAVE = 945,
@@ -592,13 +592,13 @@ enum {
STR_HELIX_DOWN_LARGE = 1467,
STR_STAFF = 1468,
STR_RIDE_MUST_START_AND_END_WITH_STATIONS = 1469,
STR_STATION_NOT_LONG_ENOUGH = 1470,
STR_SPEED = 1471,
STR_SPEED_TIP = 1472,
STR_EXCITEMENT_RATING = 1473,
STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE = 1474,
STR_INTENSITY_RATING = 1475,
@@ -608,7 +608,7 @@ enum {
STR_NAUSEA_RATING_NOT_YET_AVAILABLE = 1479,
STR_THOUGHT_START = 1480,
STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP = 1655,
STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP = 1656,
@@ -719,7 +719,7 @@ enum {
STR_OFF = 1775,
STR_ON = 1776,
STR_MUSIC = 1777,
STR_UNIFORM_COLOUR_TIP = 1790,
STR_UNIFORM_COLOUR = 1791,
STR_RESPONDING_TO_RIDE_BREAKDOWN_CALL = 1792,
@@ -779,7 +779,7 @@ enum {
STR_GUESTS_FAVOURITE_PLURAL_LABEL = 1843,
STR_RIDE_LIST_INFORMATION_TYPE_TIP = 1844,
STR_NUM_GUESTS = 1846,
STR_PLAY_MUSIC = 1849,
STR_SELECT_MUSIC_TIP = 1850,
STR_RUNNING_COST_PER_HOUR = 1851,
@@ -821,7 +821,7 @@ enum {
STR_NEVER = 1885,
STR_INSPECTING_RIDE = 1886,
STR_TIME_SINCE_LAST_INSPECTION_MINUTES = 1887,
STR_TIME_SINCE_LAST_INSPECTION_MORE_THAN_4_HOURS = 1888,
STR_DOWN_TIME_LABEL_1889 = 1889,
@@ -1572,7 +1572,7 @@ enum {
STR_HEDGES = 3059,
STR_ICE_BLOCKS = 3060,
STR_WOODEN_FENCES = 3061,
STR_RIDE_CONSTRUCTION_STANDARD_RC_TRACK_TIP = 3062,
STR_RIDE_CONSTRUCTION_WATER_CHANNEL_TIP = 3063,
@@ -1608,8 +1608,8 @@ enum {
STR_SPACE_ENTRANCE = 3089,
STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP = 3090,
STR_YOU_ARE_NOT_ALLOWED_TO_REMOVE_THIS_SECTION = 3091,
STR_YOU_ARE_NOT_ALLOWED_TO_REMOVE_THIS_SECTION = 3091,
STR_NOT_ALLOWED_TO_MODIFY_STATION = 3092,
STR_SELECT_LIFT_HILL_CHAIN_SPEED_TIP = 3097,
@@ -1774,7 +1774,7 @@ enum {
STR_CLIMATE_WARM = STR_CLIMATE_COOL_AND_WET + 1,
STR_CLIMATE_HOT_AND_DRY = STR_CLIMATE_COOL_AND_WET + 2,
STR_CLIMATE_COLD = STR_CLIMATE_COOL_AND_WET + 3,
STR_CHANGE = 3294,
STR_CHANGE_NAME_OF_PARK_TIP = 3295,
STR_CHANGE_NAME_OF_SCENARIO_TIP = 3296,