Skip to content

Commit 8a46597

Browse files
author
Your Name
committed
Fix GH actions failure
1 parent be4e71f commit 8a46597

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

CIO/CButton.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ void CButton::setMouseData(const SDL_MouseButtonEvent& button)
115115
if(button.button == SDL_BUTTON_LEFT)
116116
{
117117
// if mouse button is pressed ON the button, set marked=true
118-
if((button.state == SDL_PRESSED) && IsPointInRect(Position(button.x, button.y), Rect(Position(pos_), Extent(size_))))
118+
if((button.state == SDL_PRESSED)
119+
&& IsPointInRect(Position(button.x, button.y), Rect(Position(pos_), Extent(size_))))
119120
{
120121
marked = true;
121122
clicked = true;
@@ -309,8 +310,8 @@ bool CButton::render()
309310
button_text = "PIC";
310311
}
311312
} else if(button_text)
312-
CFont::writeText(Surf_Button, button_text, Position(size_.x / 2, (size_.y - 11) / 2),
313-
FontSize::Medium, button_text_color, FontAlign::Middle);
313+
CFont::writeText(Surf_Button, button_text, Position(size_.x / 2, (size_.y - 11) / 2), FontSize::Medium,
314+
button_text_color, FontAlign::Middle);
314315

315316
return true;
316317
}

CIO/CPicture.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
#include "../globals.h"
99
#include "CollisionDetection.h"
1010

11-
CPicture::CPicture(void callback(int), int clickedParam, Point16 pos, int picture)
12-
: pos_(pos)
11+
CPicture::CPicture(void callback(int), int clickedParam, Point16 pos, int picture) : pos_(pos)
1312
{
1413
marked = false;
1514
clicked = false;
@@ -53,7 +52,8 @@ void CPicture::setMouseData(const SDL_MouseButtonEvent& button)
5352
if(button.button == SDL_BUTTON_LEFT)
5453
{
5554
// if mouse button is pressed ON the button, set marked=true
56-
if((button.state == SDL_PRESSED) && IsPointInRect(Position(button.x, button.y), Rect(Position(pos_), Extent(size_))))
55+
if((button.state == SDL_PRESSED)
56+
&& IsPointInRect(Position(button.x, button.y), Rect(Position(pos_), Extent(size_))))
5757
{
5858
marked = true;
5959
clicked = true;

callbacks.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,9 @@ void callback::submenuOptions(int Param)
252252
Point16(global::s2->GameResolution.x / 2 - 110, 50), FontSize::Medium);
253253
if(ButtonFullscreen)
254254
SubMenu->delButton(ButtonFullscreen);
255-
ButtonFullscreen = SubMenu->addButton(
256-
submenuOptions, FULLSCREEN, Point16(global::s2->GameResolution.x / 2 - 100, 190),
257-
Extent16(200, 20), BUTTON_RED1, (global::s2->fullscreen ? "WINDOW" : "FULLSCREEN"));
255+
ButtonFullscreen =
256+
SubMenu->addButton(submenuOptions, FULLSCREEN, Point16(global::s2->GameResolution.x / 2 - 100, 190),
257+
Extent16(200, 20), BUTTON_RED1, (global::s2->fullscreen ? "WINDOW" : "FULLSCREEN"));
258258
SelectBoxRes = SubMenu->addSelectBox(ButtonFullscreen->getPos() - Point16(0, 120), Extent16(200, 110),
259259
FontSize::Medium, FontColor::Yellow, BUTTON_GREY);
260260
SelectBoxRes->addOption("800 x 600 (SVGA)", submenuOptions, SELECTBOX_800_600);

0 commit comments

Comments
 (0)