Skip to content

Commit

Permalink
Fixed build
Browse files Browse the repository at this point in the history
  • Loading branch information
@deathkiller
deathkiller committed Jan 17, 2025
1 parent 8215865 commit 940dec6
Show file tree
Hide file tree
Showing 51 changed files with 140 additions and 123 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/linux_cc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
with:
fetch-depth: 0

- name: 'Configure Cross-Compile Support (ARM64)'
uses: cyberjunk/gha-ubuntu-cross@v4
with:
arch: arm64
#- name: 'Configure Cross-Compile Support (ARM64)'
# uses: cyberjunk/gha-ubuntu-cross@v4
# with:
# arch: arm64

- name: 'Create Build Environment'
run: |
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/Actors/Multiplayer/RemotePlayerOnServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ namespace Jazz2::Actors::Multiplayer
return success;
}

void RemotePlayerOnServer::SyncWithServer(Vector2f pos, const Vector2f& speed, bool isVisible, bool isFacingLeft, bool isActivelyPushing)
void RemotePlayerOnServer::SyncWithServer(Vector2f pos, Vector2f speed, bool isVisible, bool isFacingLeft, bool isActivelyPushing)
{
if (_health <= 0) {
// Don't sync dead players to avoid cheating
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/Actors/Multiplayer/RemotePlayerOnServer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace Jazz2::Actors::Multiplayer
bool OnHandleCollision(std::shared_ptr<ActorBase> other) override;
bool OnLevelChanging(Actors::ActorBase* initiator, ExitType exitType) override;

void SyncWithServer(Vector2f pos, const Vector2f& speed, bool isVisible, bool isFacingLeft, bool isActivelyPushing);
void SyncWithServer(Vector2f pos, Vector2f speed, bool isVisible, bool isFacingLeft, bool isActivelyPushing);

protected:
struct StateFrame {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/Events/EventMap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Jazz2::Events
{
EventMap::EventMap(const Vector2i& layoutSize)
EventMap::EventMap(Vector2i layoutSize)
: _levelHandler(nullptr), _layoutSize(layoutSize), _pitType(PitType::FallForever)
{
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/Events/EventMap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace Jazz2::Events
bool IsEventActive;
};

EventMap(const Vector2i& layoutSize);
EventMap(Vector2i layoutSize);

void SetLevelHandler(ILevelHandler* levelHandler);
/** @brief Returns size of event map in tiles */
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/AboutSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ namespace Jazz2::UI::Menu
}
}

void AboutSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void AboutSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
switch (event.type) {
case TouchEventType::Down: {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/AboutSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace Jazz2::UI::Menu
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnDrawClipped(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
static constexpr std::int32_t TopLine = 2;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/BeginSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ namespace Jazz2::UI::Menu
}
}

void BeginSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void BeginSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/BeginSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Jazz2::UI::Menu
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnDrawOverlay(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
enum class Item {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/CreateServerOptionsSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ namespace Jazz2::UI::Menu
}
}

void CreateServerOptionsSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void CreateServerOptionsSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (!_shouldStart && event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/CreateServerOptionsSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Jazz2::UI::Menu
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnDrawOverlay(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

void SetGameMode(Multiplayer::MultiplayerGameMode value);

Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/CustomLevelSelectSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ namespace Jazz2::UI::Menu
}
}

void CustomLevelSelectSection::OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize)
void CustomLevelSelectSection::OnTouchEvent(const TouchEvent& event, Vector2i viewSize)
{
switch (event.type) {
case TouchEventType::Down: {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/CustomLevelSelectSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Jazz2::UI::Menu
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnDrawClipped(Canvas* canvas) override;
void OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const TouchEvent& event, Vector2i viewSize) override;

private:
struct ItemData {
Expand Down
6 changes: 3 additions & 3 deletions Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ namespace Jazz2::UI::Menu
}
}

void EpisodeSelectSection::OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize)
void EpisodeSelectSection::OnTouchEvent(const TouchEvent& event, Vector2i viewSize)
{
if (_shouldStart) {
return;
Expand All @@ -343,9 +343,9 @@ namespace Jazz2::UI::Menu
ScrollableMenuSection::OnTouchEvent(event, viewSize);
}

void EpisodeSelectSection::OnTouchUp(int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos)
void EpisodeSelectSection::OnTouchUp(int32_t newIndex, Vector2i viewSize, Vector2i touchPos)
{
int32_t halfW = viewSize.X / 2;
std::int32_t halfW = viewSize.X / 2;
if (std::abs(touchPos.X - halfW) < 150) {
if (_selectedIndex == newIndex) {
bool onExpand = (_touchLast.X > halfW + 100.0f && (_items[newIndex].Item.Flags & EpisodeDataFlags::CanContinue) == EpisodeDataFlags::CanContinue);
Expand Down
4 changes: 2 additions & 2 deletions Sources/Jazz2/UI/Menu/EpisodeSelectSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Jazz2::UI::Menu
void OnDraw(Canvas* canvas) override;
void OnDrawClipped(Canvas* canvas) override;
void OnDrawOverlay(Canvas* canvas) override;
void OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const TouchEvent& event, Vector2i viewSize) override;

private:
float _expandedAnimation;
Expand All @@ -41,7 +41,7 @@ namespace Jazz2::UI::Menu
bool _expanded;
bool _shouldStart;

void OnTouchUp(std::int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos) override;
void OnTouchUp(std::int32_t newIndex, Vector2i viewSize, Vector2i touchPos) override;
void OnExecuteSelected() override;
void OnDrawEmptyText(Canvas* canvas, std::int32_t& charOffset) override;
void OnDrawItem(Canvas* canvas, ListViewItem& item, std::int32_t& charOffset, bool isSelected) override;
Expand Down
4 changes: 2 additions & 2 deletions Sources/Jazz2/UI/Menu/HighscoresSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ namespace Jazz2::UI::Menu
}
}

void HighscoresSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void HighscoresSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down Expand Up @@ -420,7 +420,7 @@ namespace Jazz2::UI::Menu
ScrollableMenuSection::OnTouchEvent(event, viewSize);
}

void HighscoresSection::OnTouchUp(std::int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos)
void HighscoresSection::OnTouchUp(std::int32_t newIndex, Vector2i viewSize, Vector2i touchPos)
{
if (!_waitForInput) {
ScrollableMenuSection::OnTouchUp(newIndex, viewSize, touchPos);
Expand Down
4 changes: 2 additions & 2 deletions Sources/Jazz2/UI/Menu/HighscoresSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ namespace Jazz2::UI::Menu
void OnLayoutItem(Canvas* canvas, ListViewItem& item) override;
void OnDrawItem(Canvas* canvas, ListViewItem& item, std::int32_t& charOffset, bool isSelected) override;
void OnHandleInput() override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchUp(std::int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;
void OnTouchUp(std::int32_t newIndex, Vector2i viewSize, Vector2i touchPos) override;
void OnExecuteSelected() override;
void OnBackPressed() override;

Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/ImportSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace Jazz2::UI::Menu
}
}

void ImportSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void ImportSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/ImportSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Jazz2::UI::Menu
void OnShow(IMenuContainer* root) override;
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
enum class State {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ namespace Jazz2::UI::Menu
}
}

void InputDiagnosticsSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void InputDiagnosticsSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/InputDiagnosticsSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace Jazz2::UI::Menu
void OnShow(IMenuContainer* root) override;
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

NavigationFlags GetNavigationFlags() const override {
return NavigationFlags::AllowKeyboard;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/LoadingSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace Jazz2::UI::Menu
Alignment::Top, Font::DefaultColor, 1.2f, 0.4f, 0.6f, 0.6f, 0.6f, 0.9f, 1.2f);
}

void LoadingSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void LoadingSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
}
}
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/LoadingSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Jazz2::UI::Menu

void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
String _message;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/MenuSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace Jazz2::UI::Menu
/** @brief Called when a text input is detected */
virtual void OnTextInput(const nCine::TextInputEvent& event) {}
/** @brief Called when a touch event is triggered */
virtual void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) = 0;
virtual void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) = 0;

/** @brief Allows to override navigation behavior */
virtual NavigationFlags GetNavigationFlags() const {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/PauseSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace Jazz2::UI::Menu
}
}

void PauseSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void PauseSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/PauseSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Jazz2::UI::Menu
void OnShow(IMenuContainer* root) override;
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
enum class Item {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/RefreshCacheSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace Jazz2::UI::Menu
Alignment::Top, Font::DefaultColor, 0.8f, 0.7f, 1.1f, 1.1f, 0.4f, 0.9f);
}

void RefreshCacheSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void RefreshCacheSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
// No actions are allowed
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/RefreshCacheSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Jazz2::UI::Menu
void OnShow(IMenuContainer* root) override;
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
float _animation;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/RemapControlsSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ namespace Jazz2::UI::Menu
}
}

void RemapControlsSection::OnTouchUp(std::int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos)
void RemapControlsSection::OnTouchUp(std::int32_t newIndex, Vector2i viewSize, Vector2i touchPos)
{
auto& mapping = ControlScheme::GetMappings(_playerIndex)[newIndex];

Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/RemapControlsSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace Jazz2::UI::Menu
void OnKeyPressed(const KeyboardEvent& event) override;
void OnHandleInput() override;
void OnExecuteSelected() override;
void OnTouchUp(std::int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos) override;
void OnTouchUp(std::int32_t newIndex, Vector2i viewSize, Vector2i touchPos) override;
void OnBackPressed() override;

void RefreshPreviousState();
Expand Down
8 changes: 4 additions & 4 deletions Sources/Jazz2/UI/Menu/ScrollableMenuSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace Jazz2::UI::Menu
void OnShow(IMenuContainer* root) override;
void OnUpdate(float timeMult) override;
void OnDrawClipped(Canvas* canvas) override;
void OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const TouchEvent& event, Vector2i viewSize) override;

protected:
/** @brief Item in @ref ScrollableMenuSection */
Expand Down Expand Up @@ -62,7 +62,7 @@ namespace Jazz2::UI::Menu
virtual void OnHandleInput();
virtual void OnBackPressed();
virtual void OnSelectionChanged(ListViewItem& item) { }
virtual void OnTouchUp(std::int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos);
virtual void OnTouchUp(std::int32_t newIndex, Vector2i viewSize, Vector2i touchPos);
};

template<class TItem>
Expand Down Expand Up @@ -232,7 +232,7 @@ namespace Jazz2::UI::Menu
}

template<class TItem>
void ScrollableMenuSection<TItem>::OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize)
void ScrollableMenuSection<TItem>::OnTouchEvent(const TouchEvent& event, Vector2i viewSize)
{
switch (event.type) {
case TouchEventType::Down: {
Expand Down Expand Up @@ -291,7 +291,7 @@ namespace Jazz2::UI::Menu
}

template<class TItem>
void ScrollableMenuSection<TItem>::OnTouchUp(std::int32_t newIndex, const Vector2i& viewSize, const Vector2i& touchPos)
void ScrollableMenuSection<TItem>::OnTouchUp(std::int32_t newIndex, Vector2i viewSize, Vector2i touchPos)
{
std::int32_t halfW = viewSize.X / 2;
if (std::abs(touchPos.X - halfW) < 150) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/ServerSelectSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ namespace Jazz2::UI::Menu
}
}

void ServerSelectSection::OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize)
void ServerSelectSection::OnTouchEvent(const TouchEvent& event, Vector2i viewSize)
{
switch (event.type) {
case TouchEventType::Down: {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/ServerSelectSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Jazz2::UI::Menu
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnDrawClipped(Canvas* canvas) override;
void OnTouchEvent(const TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const TouchEvent& event, Vector2i viewSize) override;

void OnServerFound(Multiplayer::ServerDesc&& desc) override;

Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/SimpleMessageSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ namespace Jazz2::UI::Menu
}
}

void SimpleMessageSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void SimpleMessageSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/SimpleMessageSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Jazz2::UI::Menu
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnDrawOverlay(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
String _message;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/SoundsOptionsSection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ namespace Jazz2::UI::Menu
}
}

void SoundsOptionsSection::OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize)
void SoundsOptionsSection::OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize)
{
if (event.type == TouchEventType::Down) {
std::int32_t pointerIndex = event.findPointerIndex(event.actionIndex);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Jazz2/UI/Menu/SoundsOptionsSection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Jazz2::UI::Menu
void OnShow(IMenuContainer* root) override;
void OnUpdate(float timeMult) override;
void OnDraw(Canvas* canvas) override;
void OnTouchEvent(const nCine::TouchEvent& event, const Vector2i& viewSize) override;
void OnTouchEvent(const nCine::TouchEvent& event, Vector2i viewSize) override;

private:
enum class Item {
Expand Down
Loading

0 comments on commit 940dec6

Please sign in to comment.