mirror of https://github.com/OpenRCT2/OpenRCT2.git
Compare commits
9 Commits
5b0de43c3d
...
0ad8b37c71
Author | SHA1 | Date |
---|---|---|
Harry Hopkinson | 0ad8b37c71 | |
Aaron van Geffen | 81e068c7b2 | |
Aaron van Geffen | a61a561d01 | |
Aaron van Geffen | a627cf7a1e | |
Aaron van Geffen | ca6f142a97 | |
Michael Steenbeek | ca1118c2f1 | |
Aaron van Geffen | 779e65d8b2 | |
Aaron van Geffen | 73c592b137 | |
Harry Hopkinson | 51d1a5985f |
|
@ -6,6 +6,7 @@
|
|||
0.4.11 (2024-05-05)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: [#11512] Coloured usernames by group on multiplayer servers.
|
||||
- Feature: [#21656] Save the currently following entity into the save file.
|
||||
- Feature: [#21734] Park admittance price can now be set via text input.
|
||||
- Feature: [#21957] [Plugin] Expose whether the game is paused to the plugin API.
|
||||
- Improved: [#21728] “Fix all rides” cheat now also works if a mechanic is already fixing the ride.
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
#include <openrct2/OpenRCT2.h>
|
||||
#include <openrct2/actions/CheatSetAction.h>
|
||||
#include <openrct2/actions/ParkSetDateAction.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/localisation/Date.h>
|
||||
#include <openrct2/localisation/Formatter.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include <openrct2/core/String.hpp>
|
||||
#include <openrct2/drawing/Drawing.h>
|
||||
#include <openrct2/interface/Colour.h>
|
||||
#include <openrct2/localisation/Currency.h>
|
||||
#include <openrct2/localisation/Formatter.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
#include <openrct2/util/Util.h>
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include <openrct2/GameState.h>
|
||||
#include <openrct2/actions/ParkSetLoanAction.h>
|
||||
#include <openrct2/actions/ParkSetResearchFundingAction.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/localisation/Date.h>
|
||||
#include <openrct2/localisation/Formatter.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include <openrct2/management/Finance.h>
|
||||
#include <openrct2/management/NewsItem.h>
|
||||
#include <openrct2/peep/PeepAnimationData.h>
|
||||
#include <openrct2/peep/PeepSpriteIds.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/world/Park.h>
|
||||
|
||||
|
@ -296,15 +297,18 @@ static Widget window_game_bottom_toolbar_widgets[] =
|
|||
auto* guest = peep->As<Guest>();
|
||||
if (guest != nullptr)
|
||||
{
|
||||
if (image_id_base >= 0x2A1D && image_id_base < 0x2A3D)
|
||||
if (image_id_base >= kPeepSpriteBalloonStateWatchRideId
|
||||
&& image_id_base < kPeepSpriteBalloonStateSittingIdleId + 4)
|
||||
{
|
||||
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->BalloonColour), clipCoords);
|
||||
}
|
||||
else if (image_id_base >= 0x2BBD && image_id_base < 0x2BDD)
|
||||
if (image_id_base >= kPeepSpriteUmbrellaStateNoneId
|
||||
&& image_id_base < kPeepSpriteUmbrellaStateSittingIdleId + 4)
|
||||
{
|
||||
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->UmbrellaColour), clipCoords);
|
||||
}
|
||||
else if (image_id_base >= 0x29DD && image_id_base < 0x29FD)
|
||||
if (image_id_base >= kPeepSpriteHatStateWatchRideId
|
||||
&& image_id_base < kPeepSpriteHatStateSittingIdleId + 4)
|
||||
{
|
||||
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->HatColour), clipCoords);
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include <openrct2/management/Marketing.h>
|
||||
#include <openrct2/network/network.h>
|
||||
#include <openrct2/peep/PeepAnimationData.h>
|
||||
#include <openrct2/peep/PeepSpriteIds.h>
|
||||
#include <openrct2/ride/RideData.h>
|
||||
#include <openrct2/ride/ShopItem.h>
|
||||
#include <openrct2/scenario/Scenario.h>
|
||||
|
@ -561,19 +562,21 @@ static_assert(_guestWindowPageWidgets.size() == WINDOW_GUEST_PAGE_COUNT);
|
|||
if (guest != nullptr)
|
||||
{
|
||||
// If holding a balloon
|
||||
if (animationFrame >= 0x2A1D && animationFrame < 0x2A3D)
|
||||
if (animationFrame >= kPeepSpriteBalloonStateWatchRideId
|
||||
&& animationFrame < kPeepSpriteBalloonStateSittingIdleId + 4)
|
||||
{
|
||||
GfxDrawSprite(clipDpi, ImageId(animationFrame + 32, guest->BalloonColour), screenCoords);
|
||||
}
|
||||
|
||||
// If holding umbrella
|
||||
if (animationFrame >= 0x2BBD && animationFrame < 0x2BDD)
|
||||
if (animationFrame >= kPeepSpriteUmbrellaStateNoneId
|
||||
&& animationFrame < kPeepSpriteUmbrellaStateSittingIdleId + 4)
|
||||
{
|
||||
GfxDrawSprite(clipDpi, ImageId(animationFrame + 32, guest->UmbrellaColour), screenCoords);
|
||||
}
|
||||
|
||||
// If wearing hat
|
||||
if (animationFrame >= 0x29DD && animationFrame < 0x29FD)
|
||||
if (animationFrame >= kPeepSpriteHatStateWatchRideId && animationFrame < kPeepSpriteHatStateSittingIdleId + 4)
|
||||
{
|
||||
GfxDrawSprite(clipDpi, ImageId(animationFrame + 32, guest->HatColour), screenCoords);
|
||||
}
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include <openrct2/Context.h>
|
||||
#include <openrct2/Game.h>
|
||||
#include <openrct2/GameState.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/drawing/Drawing.h>
|
||||
#include <openrct2/entity/EntityRegistry.h>
|
||||
#include <openrct2/entity/Guest.h>
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include <openrct2/GameState.h>
|
||||
#include <openrct2/actions/RideDemolishAction.h>
|
||||
#include <openrct2/actions/RideSetStatusAction.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/drawing/Drawing.h>
|
||||
#include <openrct2/interface/Colour.h>
|
||||
#include <openrct2/localisation/Formatter.h>
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include <openrct2-ui/interface/Widget.h>
|
||||
#include <openrct2-ui/windows/Window.h>
|
||||
#include <openrct2/Context.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/core/String.hpp>
|
||||
#include <openrct2/drawing/Drawing.h>
|
||||
#include <openrct2/localisation/Formatter.h>
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include <openrct2/Context.h>
|
||||
#include <openrct2/Game.h>
|
||||
#include <openrct2/Input.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/drawing/Drawing.h>
|
||||
#include <openrct2/localisation/Formatter.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include <openrct2-ui/interface/Widget.h>
|
||||
#include <openrct2-ui/windows/Window.h>
|
||||
#include <openrct2/Context.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include <openrct2/ParkImporter.h>
|
||||
#include <openrct2/PlatformEnvironment.h>
|
||||
#include <openrct2/actions/LoadOrQuitAction.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
#include <openrct2/sprites.h>
|
||||
#include <openrct2/ui/UiContext.h>
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include <openrct2-ui/interface/Widget.h>
|
||||
#include <openrct2-ui/windows/Window.h>
|
||||
#include <openrct2/Context.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/localisation/Localisation.h>
|
||||
|
||||
namespace OpenRCT2::Ui::Windows
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
#include "GameState.h"
|
||||
#include "actions/CheatSetAction.h"
|
||||
#include "actions/ParkSetLoanAction.h"
|
||||
#include "config/Config.h"
|
||||
#include "core/DataSerialiser.h"
|
||||
#include "localisation/Localisation.h"
|
||||
#include "network/network.h"
|
||||
|
|
|
@ -361,6 +361,12 @@ void GameLoadInit()
|
|||
auto& gameState = GetGameState();
|
||||
windowManager->SetMainView(gameState.SavedView, gameState.SavedViewZoom, gameState.SavedViewRotation);
|
||||
|
||||
if (gameState.CurrentlyFollowingEntity != EntityId::GetNull())
|
||||
{
|
||||
auto* mainWindow = WindowGetMain();
|
||||
WindowFollowSprite(*mainWindow, gameState.CurrentlyFollowingEntity);
|
||||
}
|
||||
|
||||
if (NetworkGetMode() != NETWORK_MODE_CLIENT)
|
||||
{
|
||||
GameActions::ClearQueue();
|
||||
|
|
|
@ -126,6 +126,7 @@ namespace OpenRCT2
|
|||
ScreenCoordsXY SavedView;
|
||||
uint8_t SavedViewRotation;
|
||||
ZoomLevel SavedViewZoom;
|
||||
EntityId CurrentlyFollowingEntity{ EntityId::GetNull() };
|
||||
|
||||
ObjectEntryIndex LastEntranceStyle;
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "core/Path.hpp"
|
||||
#include "core/String.hpp"
|
||||
#include "platform/Platform.h"
|
||||
#include "util/Util.h"
|
||||
|
||||
using namespace OpenRCT2;
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
#include "../Context.h"
|
||||
#include "../GameState.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/MemoryStream.h"
|
||||
#include "../drawing/Drawing.h"
|
||||
#include "../localisation/Localisation.h"
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "../OpenRCT2.h"
|
||||
#include "../core/Console.hpp"
|
||||
#include "../core/String.hpp"
|
||||
#include "../drawing/Font.h"
|
||||
#include "../platform/Platform.h"
|
||||
|
||||
#include <cstring>
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "../Game.h"
|
||||
#include "../GameState.h"
|
||||
#include "../OpenRCT2.h"
|
||||
#include "../config/ConfigTypes.h"
|
||||
#include "../core/Console.hpp"
|
||||
#include "../entity/EntityRegistry.h"
|
||||
#include "../network/network.h"
|
||||
|
|
|
@ -10,19 +10,13 @@
|
|||
#pragma once
|
||||
|
||||
#include "../core/String.hpp"
|
||||
#include "../drawing/Drawing.h"
|
||||
#include "../localisation/Currency.h"
|
||||
#include "../localisation/CurrencyTypes.h"
|
||||
#include "ConfigTypes.h"
|
||||
|
||||
#include <atomic>
|
||||
#include <string>
|
||||
|
||||
enum class MeasurementFormat : int32_t;
|
||||
enum class TemperatureUnit : int32_t;
|
||||
enum class ScaleQuality : int32_t;
|
||||
enum class Sort : int32_t;
|
||||
enum class VirtualFloorStyles : int32_t;
|
||||
enum class DrawingEngine : int32_t;
|
||||
enum class TitleMusicKind : int32_t;
|
||||
struct Gx;
|
||||
|
||||
struct GeneralConfiguration
|
||||
{
|
||||
|
@ -221,43 +215,6 @@ struct PluginConfiguration
|
|||
u8string AllowedHosts;
|
||||
};
|
||||
|
||||
enum class Sort : int32_t
|
||||
{
|
||||
NameAscending,
|
||||
NameDescending,
|
||||
DateAscending,
|
||||
DateDescending,
|
||||
};
|
||||
|
||||
enum class TemperatureUnit : int32_t
|
||||
{
|
||||
Celsius,
|
||||
Fahrenheit
|
||||
};
|
||||
|
||||
enum class ScaleQuality : int32_t
|
||||
{
|
||||
NearestNeighbour,
|
||||
Linear,
|
||||
SmoothNearestNeighbour
|
||||
};
|
||||
|
||||
enum class MeasurementFormat : int32_t
|
||||
{
|
||||
Imperial,
|
||||
Metric,
|
||||
SI
|
||||
};
|
||||
|
||||
enum class TitleMusicKind : int32_t
|
||||
{
|
||||
None,
|
||||
Random,
|
||||
OpenRCT2,
|
||||
RCT1,
|
||||
RCT2,
|
||||
};
|
||||
|
||||
extern GeneralConfiguration gConfigGeneral;
|
||||
extern InterfaceConfiguration gConfigInterface;
|
||||
extern SoundConfiguration gConfigSound;
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
/*****************************************************************************
|
||||
* Copyright (c) 2014-2024 OpenRCT2 developers
|
||||
*
|
||||
* For a complete list of all authors, please refer to contributors.md
|
||||
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
|
||||
*
|
||||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
enum class MeasurementFormat : int32_t;
|
||||
enum class TemperatureUnit : int32_t;
|
||||
enum class CurrencyType : uint8_t;
|
||||
enum class ScaleQuality : int32_t;
|
||||
enum class Sort : int32_t;
|
||||
enum class VirtualFloorStyles : int32_t;
|
||||
enum class DrawingEngine : int32_t;
|
||||
enum class TitleMusicKind : int32_t;
|
||||
|
||||
enum class Sort : int32_t
|
||||
{
|
||||
NameAscending,
|
||||
NameDescending,
|
||||
DateAscending,
|
||||
DateDescending,
|
||||
};
|
||||
|
||||
enum class TemperatureUnit : int32_t
|
||||
{
|
||||
Celsius,
|
||||
Fahrenheit
|
||||
};
|
||||
|
||||
enum class ScaleQuality : int32_t
|
||||
{
|
||||
NearestNeighbour,
|
||||
Linear,
|
||||
SmoothNearestNeighbour
|
||||
};
|
||||
|
||||
enum class MeasurementFormat : int32_t
|
||||
{
|
||||
Imperial,
|
||||
Metric,
|
||||
SI
|
||||
};
|
||||
|
||||
enum class TitleMusicKind : int32_t
|
||||
{
|
||||
None,
|
||||
Random,
|
||||
OpenRCT2,
|
||||
RCT1,
|
||||
RCT2,
|
||||
};
|
|
@ -10,7 +10,6 @@
|
|||
#include "NewDrawing.h"
|
||||
|
||||
#include "../Context.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../drawing/Drawing.h"
|
||||
#include "../interface/Screenshot.h"
|
||||
#include "../localisation/StringIds.h"
|
||||
|
|
|
@ -19,8 +19,10 @@
|
|||
# include "../OpenRCT2.h"
|
||||
# include "../core/Numerics.hpp"
|
||||
# include "../core/String.hpp"
|
||||
# include "../drawing/Font.h"
|
||||
# include "../localisation/LocalisationService.h"
|
||||
# include "../platform/Platform.h"
|
||||
# include "../util/Util.h"
|
||||
# include "DrawingLock.hpp"
|
||||
# include "TTF.h"
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
#include "../Input.h"
|
||||
#include "../actions/StaffSetOrdersAction.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/DataSerialiser.h"
|
||||
#include "../entity/EntityRegistry.h"
|
||||
#include "../interface/Viewport.h"
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include "../PlatformEnvironment.h"
|
||||
#include "../actions/CheatSetAction.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/Console.hpp"
|
||||
#include "../core/File.h"
|
||||
#include "../core/Imaging.h"
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
#include "../Context.h"
|
||||
#include "../OpenRCT2.h"
|
||||
#include "../config/ConfigTypes.h"
|
||||
#include "../platform/Platform.h"
|
||||
#include "../scripting/ScriptEngine.h"
|
||||
|
||||
|
|
|
@ -1751,6 +1751,7 @@ void WindowFollowSprite(WindowBase& w, EntityId spriteIndex)
|
|||
if (spriteIndex.ToUnderlying() < MAX_ENTITIES || spriteIndex.IsNull())
|
||||
{
|
||||
w.viewport_smart_follow_sprite = spriteIndex;
|
||||
GetGameState().CurrentlyFollowingEntity = spriteIndex;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1758,6 +1759,7 @@ void WindowUnfollowSprite(WindowBase& w)
|
|||
{
|
||||
w.viewport_smart_follow_sprite = EntityId::GetNull();
|
||||
w.viewport_target_sprite = EntityId::GetNull();
|
||||
GetGameState().CurrentlyFollowingEntity = EntityId::GetNull();
|
||||
}
|
||||
|
||||
Viewport* WindowGetViewport(WindowBase* w)
|
||||
|
|
|
@ -176,6 +176,7 @@
|
|||
<ClInclude Include="common.h" />
|
||||
<ClInclude Include="config\Config.h" />
|
||||
<ClInclude Include="config\ConfigEnum.hpp" />
|
||||
<ClInclude Include="config\ConfigTypes.h" />
|
||||
<ClInclude Include="config\IniReader.hpp" />
|
||||
<ClInclude Include="config\IniWriter.hpp" />
|
||||
<ClInclude Include="Context.h" />
|
||||
|
@ -278,6 +279,7 @@
|
|||
<ClInclude Include="Limits.h" />
|
||||
<ClInclude Include="localisation\ConversionTables.h" />
|
||||
<ClInclude Include="localisation\Currency.h" />
|
||||
<ClInclude Include="localisation\CurrencyTypes.h" />
|
||||
<ClInclude Include="localisation\Date.h" />
|
||||
<ClInclude Include="localisation\FormatCodes.h" />
|
||||
<ClInclude Include="localisation\Formatter.h" />
|
||||
|
|
|
@ -12,38 +12,7 @@
|
|||
#include "../common.h"
|
||||
#include "../core/String.hpp"
|
||||
#include "../util/Util.h"
|
||||
|
||||
// List of currencies
|
||||
enum class CurrencyType : uint8_t
|
||||
{
|
||||
Pounds, // British Pound
|
||||
Dollars, // US Dollar
|
||||
Franc, // French Franc
|
||||
DeutscheMark, // Deutsche Mark
|
||||
Yen, // Japanese Yen
|
||||
Peseta, // Spanish Peseta
|
||||
Lira, // Italian Lira
|
||||
Guilders, // Dutch Gilder
|
||||
Krona, // Swedish Krona
|
||||
Euros, // Euro
|
||||
Won, // South Korean Won
|
||||
Rouble, // Russian Rouble
|
||||
CzechKoruna, // Czech koruna
|
||||
HKD, // Hong Kong Dollar
|
||||
TWD, // New Taiwan Dollar
|
||||
Yuan, // Chinese Yuan
|
||||
Forint, // Hungarian Forint
|
||||
|
||||
Custom, // Custom currency
|
||||
|
||||
Count // Last item
|
||||
};
|
||||
|
||||
enum class CurrencyAffix
|
||||
{
|
||||
Prefix,
|
||||
Suffix
|
||||
};
|
||||
#include "CurrencyTypes.h"
|
||||
|
||||
#define CURRENCY_SYMBOL_MAX_SIZE 8
|
||||
#define CURRENCY_RATE_MAX_NUM_DIGITS 9
|
||||
|
@ -62,6 +31,7 @@ struct CurrencyDescriptor
|
|||
};
|
||||
|
||||
// List of currency formats
|
||||
// TODO: refactor into getter
|
||||
extern CurrencyDescriptor CurrencyDescriptors[EnumValue(CurrencyType::Count)];
|
||||
|
||||
/**
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
/*****************************************************************************
|
||||
* Copyright (c) 2014-2024 OpenRCT2 developers
|
||||
*
|
||||
* For a complete list of all authors, please refer to contributors.md
|
||||
* Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
|
||||
*
|
||||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
// List of currencies
|
||||
enum class CurrencyType : uint8_t
|
||||
{
|
||||
Pounds, // British Pound
|
||||
Dollars, // US Dollar
|
||||
Franc, // French Franc
|
||||
DeutscheMark, // Deutsche Mark
|
||||
Yen, // Japanese Yen
|
||||
Peseta, // Spanish Peseta
|
||||
Lira, // Italian Lira
|
||||
Guilders, // Dutch Gilder
|
||||
Krona, // Swedish Krona
|
||||
Euros, // Euro
|
||||
Won, // South Korean Won
|
||||
Rouble, // Russian Rouble
|
||||
CzechKoruna, // Czech koruna
|
||||
HKD, // Hong Kong Dollar
|
||||
TWD, // New Taiwan Dollar
|
||||
Yuan, // Chinese Yuan
|
||||
Forint, // Hungarian Forint
|
||||
|
||||
Custom, // Custom currency
|
||||
|
||||
Count // Last item
|
||||
};
|
||||
|
||||
enum class CurrencyAffix
|
||||
{
|
||||
Prefix,
|
||||
Suffix
|
||||
};
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
#include "../config/Config.h"
|
||||
#include "../util/Util.h"
|
||||
#include "Currency.h"
|
||||
#include "Formatter.h"
|
||||
#include "Localisation.h"
|
||||
#include "StringIds.h"
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "../management/Marketing.h"
|
||||
#include "../ride/Ride.h"
|
||||
#include "../util/Util.h"
|
||||
#include "Currency.h"
|
||||
#include "Date.h"
|
||||
#include "Formatting.h"
|
||||
#include "Localisation.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#pragma once
|
||||
|
||||
#include "../management/Marketing.h"
|
||||
#include "Currency.h"
|
||||
#include "Date.h"
|
||||
#include "FormatCodes.h"
|
||||
#include "Language.h"
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
#include "../OpenRCT2.h"
|
||||
#include "../PlatformEnvironment.h"
|
||||
#include "../common.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/Console.hpp"
|
||||
#include "../core/DataSerialiser.h"
|
||||
#include "../core/FileIndex.hpp"
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
#include "../core/Guard.hpp"
|
||||
#include "../drawing/Drawing.h"
|
||||
#include "../interface/Viewport.h"
|
||||
#include "../localisation/Currency.h"
|
||||
#include "../localisation/Formatting.h"
|
||||
#include "../localisation/Localisation.h"
|
||||
#include "../localisation/LocalisationService.h"
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
#include "../../Game.h"
|
||||
#include "../../GameState.h"
|
||||
#include "../../config/Config.h"
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../localisation/Date.h"
|
||||
#include "../../object/SmallSceneryEntry.h"
|
||||
|
|
|
@ -599,7 +599,7 @@ namespace OpenRCT2
|
|||
|
||||
void ReadWriteInterfaceChunk(GameState_t& gameState, OrcaStream& os)
|
||||
{
|
||||
os.ReadWriteChunk(ParkFileChunkType::INTERFACE, [&gameState](OrcaStream::ChunkStream& cs) {
|
||||
os.ReadWriteChunk(ParkFileChunkType::INTERFACE, [&gameState, &os](OrcaStream::ChunkStream& cs) {
|
||||
cs.ReadWrite(gameState.SavedView.x);
|
||||
cs.ReadWrite(gameState.SavedView.y);
|
||||
if (cs.GetMode() == OrcaStream::Mode::READING)
|
||||
|
@ -612,6 +612,12 @@ namespace OpenRCT2
|
|||
cs.Write(static_cast<int8_t>(gameState.SavedViewZoom));
|
||||
}
|
||||
cs.ReadWrite(gameState.SavedViewRotation);
|
||||
|
||||
if (os.GetHeader().TargetVersion >= PARK_FILE_CURRENT_VERSION)
|
||||
cs.ReadWrite(gameState.CurrentlyFollowingEntity);
|
||||
else
|
||||
gameState.CurrentlyFollowingEntity = EntityId::GetNull();
|
||||
|
||||
cs.ReadWrite(gameState.LastEntranceStyle);
|
||||
cs.ReadWrite(gameState.EditorStep);
|
||||
});
|
||||
|
|
|
@ -11,10 +11,10 @@ namespace OpenRCT2
|
|||
struct GameState_t;
|
||||
|
||||
// Current version that is saved.
|
||||
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 33;
|
||||
constexpr uint32_t PARK_FILE_CURRENT_VERSION = 34;
|
||||
|
||||
// The minimum version that is forwards compatible with the current version.
|
||||
constexpr uint32_t PARK_FILE_MIN_VERSION = 33;
|
||||
constexpr uint32_t PARK_FILE_MIN_VERSION = 34;
|
||||
|
||||
// The minimum version that is backwards compatible with the current version.
|
||||
// If this is increased beyond 0, uncomment the checks in ParkFile.cpp and Context.cpp!
|
||||
|
|
|
@ -16,9 +16,9 @@
|
|||
|
||||
#include "../Context.h"
|
||||
#include "../Game.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/File.h"
|
||||
#include "../core/Path.hpp"
|
||||
#include "../localisation/Currency.h"
|
||||
#include "../localisation/Localisation.h"
|
||||
#include "Platform.h"
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
# include "../Date.h"
|
||||
# include "../core/Memory.hpp"
|
||||
# include "../core/Path.hpp"
|
||||
# include "../core/String.hpp"
|
||||
# include "../util/Util.h"
|
||||
|
||||
# include <cerrno>
|
||||
|
|
|
@ -10,7 +10,8 @@
|
|||
#pragma once
|
||||
|
||||
#include "../common.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../config/ConfigTypes.h"
|
||||
#include "../core/String.hpp"
|
||||
|
||||
#include <ctime>
|
||||
#include <string>
|
||||
|
@ -42,6 +43,7 @@ enum class SPECIAL_FOLDER
|
|||
|
||||
struct RealWorldDate;
|
||||
struct RealWorldTime;
|
||||
struct TTFFontDescriptor;
|
||||
|
||||
namespace Platform
|
||||
{
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include "../GameState.h"
|
||||
#include "../OpenRCT2.h"
|
||||
#include "../ParkImporter.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/Console.hpp"
|
||||
#include "../core/FileStream.h"
|
||||
#include "../core/IStream.hpp"
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../TrackImporter.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/FileStream.h"
|
||||
#include "../core/MemoryStream.h"
|
||||
#include "../core/Path.hpp"
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
#include "../Context.h"
|
||||
#include "../PlatformEnvironment.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/Collections.hpp"
|
||||
#include "../core/Console.hpp"
|
||||
#include "../core/File.h"
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#include "../Context.h"
|
||||
#include "../Game.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../interface/Viewport.h"
|
||||
#include "../localisation/Localisation.h"
|
||||
#include "../localisation/StringIds.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#include "../../config/Config.h"
|
||||
#include "../../entity/EntityRegistry.h"
|
||||
#include "../../entity/Guest.h"
|
||||
#include "../../interface/Viewport.h"
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
*****************************************************************************/
|
||||
|
||||
#include "../../common.h"
|
||||
#include "../../config/Config.h"
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../paint/Paint.h"
|
||||
#include "../../paint/support/WoodenSupports.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#include "../../config/Config.h"
|
||||
#include "../../entity/EntityRegistry.h"
|
||||
#include "../../interface/Viewport.h"
|
||||
#include "../../paint/Paint.h"
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
* OpenRCT2 is licensed under the GNU General Public License version 3.
|
||||
*****************************************************************************/
|
||||
|
||||
#include "../config/Config.h"
|
||||
#include "../drawing/X8DrawingEngine.h"
|
||||
#include "UiContext.h"
|
||||
#include "WindowManager.h"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#include "../Context.h"
|
||||
#include "../common.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../config/ConfigTypes.h"
|
||||
#include "../interface/Cursors.h"
|
||||
|
||||
#include <memory>
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
#include "../actions/ParkEntranceRemoveAction.h"
|
||||
#include "../actions/WallRemoveAction.h"
|
||||
#include "../audio/audio.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/Guard.hpp"
|
||||
#include "../interface/Cursors.h"
|
||||
#include "../interface/Viewport.h"
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include "../GameState.h"
|
||||
#include "../OpenRCT2.h"
|
||||
#include "../actions/ParkSetParameterAction.h"
|
||||
#include "../config/Config.h"
|
||||
#include "../core/Memory.hpp"
|
||||
#include "../core/String.hpp"
|
||||
#include "../entity/Litter.h"
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
#include <openrct2/OpenRCT2.h>
|
||||
#include <openrct2/ParkImporter.h>
|
||||
#include <openrct2/audio/AudioContext.h>
|
||||
#include <openrct2/config/Config.h>
|
||||
#include <openrct2/core/Crypt.h>
|
||||
#include <openrct2/core/File.h>
|
||||
#include <openrct2/core/MemoryStream.h>
|
||||
|
|
Loading…
Reference in New Issue