Clang format splash screen
This commit is contained in:
+3
-1
@@ -34,7 +34,7 @@ SpaceBeforeParensOptions:
|
|||||||
AlignOperands: AlignAfterOperator
|
AlignOperands: AlignAfterOperator
|
||||||
BreakBeforeBinaryOperators: None
|
BreakBeforeBinaryOperators: None
|
||||||
|
|
||||||
IndentPPDirectives: AfterHash
|
IndentPPDirectives: None
|
||||||
AlignConsecutiveMacros: Consecutive
|
AlignConsecutiveMacros: Consecutive
|
||||||
|
|
||||||
BinPackArguments: false
|
BinPackArguments: false
|
||||||
@@ -48,3 +48,5 @@ ReflowComments: true
|
|||||||
SpacesInLineCommentPrefix:
|
SpacesInLineCommentPrefix:
|
||||||
Minimum: 1
|
Minimum: 1
|
||||||
Maximum: 1
|
Maximum: 1
|
||||||
|
|
||||||
|
PenaltyReturnTypeOnItsOwnLine: 99999999
|
||||||
|
|||||||
@@ -17,7 +17,10 @@ jobs:
|
|||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
|
|
||||||
- name: Clang Format
|
- name: Clang Format
|
||||||
run: clang-format --dry-run -Werror include/bitset.h source/bitset.c
|
run: >
|
||||||
|
clang-format --dry-run -Werror
|
||||||
|
include/bitset.h source/bitset.c
|
||||||
|
include/splash_screen.h source/splash_screen.c
|
||||||
# Currently contains only the code that has been formatted to conform
|
# Currently contains only the code that has been formatted to conform
|
||||||
# When all existing code conforms, change to this:
|
# When all existing code conforms, change to this:
|
||||||
# run: clang-format --dry-run -Werror include/*.h source/*.c
|
# run: clang-format --dry-run -Werror include/*.h source/*.c
|
||||||
|
|||||||
+11
-5
@@ -1,12 +1,12 @@
|
|||||||
#include "splash_screen.h"
|
#include "splash_screen.h"
|
||||||
|
|
||||||
#include <tonc.h>
|
|
||||||
|
|
||||||
#include "graphic_utils.h"
|
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
|
#include "graphic_utils.h"
|
||||||
#include "maxmod.h"
|
#include "maxmod.h"
|
||||||
#include "soundbank.h"
|
#include "soundbank.h"
|
||||||
|
|
||||||
|
#include <tonc.h>
|
||||||
|
|
||||||
static const Rect COUNTDOWN_TIMER_RECT = {208, 144, 240, 152};
|
static const Rect COUNTDOWN_TIMER_RECT = {208, 144, 240, 152};
|
||||||
static uint timer = 0;
|
static uint timer = 0;
|
||||||
|
|
||||||
@@ -15,7 +15,10 @@ void splash_screen_on_init()
|
|||||||
timer = 0;
|
timer = 0;
|
||||||
|
|
||||||
tte_printf("#{P:72,8; cx:0xF000}DISCLAIMER");
|
tte_printf("#{P:72,8; cx:0xF000}DISCLAIMER");
|
||||||
tte_printf("#{P:8,24; cx:0xF000}This project is NOT endorsed \n by or affiliated with \n Playstack or LocalThunk.\n\n If you have paid for this, \n you have been scammed \n and should request a refund \n IMMEDIATELY. \n\n The only official place \n to obtain this is from: \n\n 'github.com/\n cellos51/balatro-gba'");
|
tte_printf(
|
||||||
|
"#{P:8,24; cx:0xF000}This project is NOT endorsed \n by or affiliated with \n Playstack or LocalThunk.\n\n If "
|
||||||
|
"you have paid for this, \n you have been scammed \n and should request a refund \n IMMEDIATELY. \n\n The only "
|
||||||
|
"official place \n to obtain this is from: \n\n 'github.com/\n cellos51/balatro-gba'");
|
||||||
tte_printf("#{P:8,144; cx:0xF000}(Press any key to skip)");
|
tte_printf("#{P:8,144; cx:0xF000}(Press any key to skip)");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,7 +29,10 @@ void splash_screen_on_update()
|
|||||||
if (timer < SPLASH_DURATION_FRAMES)
|
if (timer < SPLASH_DURATION_FRAMES)
|
||||||
{
|
{
|
||||||
tte_erase_rect_wrapper(COUNTDOWN_TIMER_RECT);
|
tte_erase_rect_wrapper(COUNTDOWN_TIMER_RECT);
|
||||||
tte_printf("#{P:%d,%d; cx:0xF000}%d", COUNTDOWN_TIMER_RECT.left, COUNTDOWN_TIMER_RECT.top, 1 + (SPLASH_DURATION_FRAMES - timer) / SPLASH_FPS);
|
tte_printf("#{P:%d,%d; cx:0xF000}%d",
|
||||||
|
COUNTDOWN_TIMER_RECT.left,
|
||||||
|
COUNTDOWN_TIMER_RECT.top,
|
||||||
|
1 + (SPLASH_DURATION_FRAMES - timer) / SPLASH_FPS);
|
||||||
|
|
||||||
if (!key_hit(KEY_ANY))
|
if (!key_hit(KEY_ANY))
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user