From 57f657e1bed968f672c34c9570ceb126ee4d81c0 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Tue, 23 May 2023 21:42:54 +0300 Subject: [PATCH] clang-format --- src/character_editor.cc | 14 +++++++------- src/credits.cc | 2 +- src/dbox.cc | 6 +++--- src/delay.cc | 8 +++++--- src/delay.h | 2 +- src/elevator.cc | 4 ++-- src/game_dialog.cc | 6 +++--- src/input.cc | 2 +- src/loadsave.cc | 6 +++--- src/movie_lib.cc | 16 ++++++++-------- src/pipboy.cc | 4 ++-- src/preferences.cc | 4 ++-- src/vcr.cc | 2 +- 13 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/character_editor.cc b/src/character_editor.cc index c089a57..ab4a3e4 100644 --- a/src/character_editor.cc +++ b/src/character_editor.cc @@ -16,6 +16,7 @@ #include "db.h" #include "dbox.h" #include "debug.h" +#include "delay.h" #include "draw.h" #include "game.h" #include "game_mouse.h" @@ -45,7 +46,6 @@ #include "window_manager.h" #include "word_wrap.h" #include "worldmap.h" -#include "delay.h" namespace fallout { @@ -1992,7 +1992,7 @@ static int _get_input_str(int win, int cancelKeyCode, char* text, int maxLength, windowRefresh(win); - delay_ms(1000 / 24 - (getTicks() - _frame_time)); + delay_ms(1000 / 24 - (getTicks() - _frame_time)); renderPresent(); sharedFpsLimiter.throttle(); @@ -2304,7 +2304,7 @@ static void characterEditorDrawBigNumber(int x, int y, int flags, int value, int windowWidth); windowRefreshRect(windowHandle, &rect); renderPresent(); - delay_ms(BIG_NUM_ANIMATION_DELAY - (getTicks() - _frame_time)); + delay_ms(BIG_NUM_ANIMATION_DELAY - (getTicks() - _frame_time)); } blitBufferToBuffer(numbersGraphicBufferPtr + BIG_NUM_WIDTH * tens, @@ -3529,9 +3529,9 @@ static int characterEditorEditAge() } if (v33 > dbl_50170B) { - delay_ms(1000 / _repFtime - (getTicks() - _frame_time)); + delay_ms(1000 / _repFtime - (getTicks() - _frame_time)); } else { - delay_ms(1000 / 24 - (getTicks() - _frame_time)); + delay_ms(1000 / 24 - (getTicks() - _frame_time)); } keyCode = inputGetInput(); @@ -3545,7 +3545,7 @@ static int characterEditorEditAge() } else { windowRefresh(win); - delay_ms(1000 / 24 - (getTicks() - _frame_time)); + delay_ms(1000 / 24 - (getTicks() - _frame_time)); } renderPresent(); @@ -5271,7 +5271,7 @@ static void characterEditorHandleAdjustSkillButtonPressed(int keyCode) if (!isUsingKeyboard) { unspentSp = pcGetStat(PC_STAT_UNSPENT_SKILL_POINTS); if (repeatDelay >= dbl_5018F0) { - delay_ms(1000 / _repFtime - (getTicks() - _frame_time)); + delay_ms(1000 / _repFtime - (getTicks() - _frame_time)); } else { delay_ms(1000 / 24 - (getTicks() - _frame_time)); } diff --git a/src/credits.cc b/src/credits.cc index 8f3f1f9..be17580 100644 --- a/src/credits.cc +++ b/src/credits.cc @@ -9,6 +9,7 @@ #include "cycle.h" #include "db.h" #include "debug.h" +#include "delay.h" #include "draw.h" #include "game_mouse.h" #include "input.h" @@ -21,7 +22,6 @@ #include "svga.h" #include "text_font.h" #include "window_manager.h" -#include "delay.h" namespace fallout { diff --git a/src/dbox.cc b/src/dbox.cc index 56a9ba2..b0caacf 100644 --- a/src/dbox.cc +++ b/src/dbox.cc @@ -9,6 +9,7 @@ #include "character_editor.h" #include "color.h" #include "debug.h" +#include "delay.h" #include "draw.h" #include "game.h" #include "game_sound.h" @@ -21,7 +22,6 @@ #include "text_font.h" #include "window_manager.h" #include "word_wrap.h" -#include "delay.h" namespace fallout { @@ -909,7 +909,7 @@ int showLoadFileDialog(char* title, char** fileList, char* dest, int fileListLen doubleClickTimer = FILE_DIALOG_DOUBLE_CLICK_DELAY; doubleClickSelectedFileIndex = -2; } - + delay_ms(1000 / 24 - (getTicks() - tick)); } @@ -1367,7 +1367,7 @@ int showSaveFileDialog(char* title, char** fileList, char* dest, int fileListLen doubleClickTimer = FILE_DIALOG_DOUBLE_CLICK_DELAY; doubleClickSelectedFileIndex = -2; } - + delay_ms(1000 / 24 - (getTicks() - tick)); } diff --git a/src/delay.cc b/src/delay.cc index eedd8ad..dd9fa68 100644 --- a/src/delay.cc +++ b/src/delay.cc @@ -1,9 +1,11 @@ #include "delay.h" + #include -void delay_ms(int ms) { - if (ms <= 0){ +void delay_ms(int ms) +{ + if (ms <= 0) { return; } SDL_Delay(ms); -} \ No newline at end of file +} diff --git a/src/delay.h b/src/delay.h index f2962b4..32b6f01 100644 --- a/src/delay.h +++ b/src/delay.h @@ -3,4 +3,4 @@ void delay_ms(int ms); -#endif \ No newline at end of file +#endif diff --git a/src/elevator.cc b/src/elevator.cc index 334e5f4..e343417 100644 --- a/src/elevator.cc +++ b/src/elevator.cc @@ -8,6 +8,7 @@ #include "art.h" #include "cycle.h" #include "debug.h" +#include "delay.h" #include "draw.h" #include "game_mouse.h" #include "game_sound.h" @@ -21,7 +22,6 @@ #include "sfall_config.h" #include "svga.h" #include "window_manager.h" -#include "delay.h" namespace fallout { @@ -453,7 +453,7 @@ int elevatorSelectLevel(int elevator, int* mapPtr, int* elevationPtr, int* tileP _elevatorBackgroundFrmImage.getWidth()); windowRefresh(gElevatorWindow); - + delay_ms(delay - (getTicks() - tick)); renderPresent(); diff --git a/src/game_dialog.cc b/src/game_dialog.cc index 11829e6..e3f7495 100644 --- a/src/game_dialog.cc +++ b/src/game_dialog.cc @@ -13,6 +13,7 @@ #include "critter.h" #include "cycle.h" #include "debug.h" +#include "delay.h" #include "dialog.h" #include "display_monitor.h" #include "draw.h" @@ -40,7 +41,6 @@ #include "text_object.h" #include "tile.h" #include "window_manager.h" -#include "delay.h" namespace fallout { @@ -2971,7 +2971,7 @@ void _gdialog_scroll_subwin(int win, int a2, unsigned char* a3, unsigned char* a windowRefreshRect(win, &rect); v7 += 10; v9 -= 10 * (GAME_DIALOG_WINDOW_WIDTH); - + delay_ms(33); renderPresent(); @@ -3009,7 +3009,7 @@ void _gdialog_scroll_subwin(int win, int a2, unsigned char* a3, unsigned char* a windowRefreshRect(win, &rect); rect.top += 10; - + delay_ms(33); renderPresent(); diff --git a/src/input.cc b/src/input.cc index 56c90c1..ed30327 100644 --- a/src/input.cc +++ b/src/input.cc @@ -4,6 +4,7 @@ #include "audio_engine.h" #include "color.h" +#include "delay.h" #include "dinput.h" #include "draw.h" #include "kb.h" @@ -14,7 +15,6 @@ #include "touch.h" #include "vcr.h" #include "win32.h" -#include "delay.h" namespace fallout { diff --git a/src/loadsave.cc b/src/loadsave.cc index 0e3fffc..ed103fa 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -18,6 +18,7 @@ #include "db.h" #include "dbox.h" #include "debug.h" +#include "delay.h" #include "display_monitor.h" #include "draw.h" #include "file_utils.h" @@ -55,7 +56,6 @@ #include "window_manager.h" #include "word_wrap.h" #include "worldmap.h" -#include "delay.h" namespace fallout { @@ -1153,7 +1153,7 @@ int lsgLoadGame(int mode) } if (scrollCounter > 14.4) { - delay_ms(1000 / scrollVelocity - (getTicks() - start)); + delay_ms(1000 / scrollVelocity - (getTicks() - start)); } else { delay_ms(1000 / 24 - (getTicks() - start)); } @@ -1205,7 +1205,7 @@ int lsgLoadGame(int mode) doubleClickSlot = -1; } - delay_ms(1000 / 24 - (getTicks() - time)); + delay_ms(1000 / 24 - (getTicks() - time)); } if (rc == 1) { diff --git a/src/movie_lib.cc b/src/movie_lib.cc index f85d0b7..5db883b 100644 --- a/src/movie_lib.cc +++ b/src/movie_lib.cc @@ -9,8 +9,8 @@ #include #include "audio_engine.h" -#include "platform_compat.h" #include "delay.h" +#include "platform_compat.h" namespace fallout { @@ -796,7 +796,7 @@ static int _syncWait() if (((_sync_time + 1000 * compat_timeGetTime()) & 0x80000000) != 0) { result = 1; - delay_ms(-(_sync_time + 1000 * compat_timeGetTime())/1000 - 3); + delay_ms(-(_sync_time + 1000 * compat_timeGetTime()) / 1000 - 3); while (((_sync_time + 1000 * compat_timeGetTime()) & 0x80000000) != 0) ; } @@ -1299,9 +1299,9 @@ static void _MVE_sndSync() } v0 = true; - #ifdef EMSCRIPTEN - delay_ms(1); - #endif +#ifdef EMSCRIPTEN + delay_ms(1); +#endif } if (dword_6B3660 != dword_6B3AE4) { @@ -1324,10 +1324,10 @@ static int _syncWaitLevel(int a1) } v2 = _sync_time + a1; - do { + do { result = v2 + 1000 * compat_timeGetTime(); - if (result < 0) { - delay_ms(-result/1000 - 3); + if (result < 0) { + delay_ms(-result / 1000 - 3); } result = v2 + 1000 * compat_timeGetTime(); } while (result < 0); diff --git a/src/pipboy.cc b/src/pipboy.cc index 2df236d..b4f3091 100644 --- a/src/pipboy.cc +++ b/src/pipboy.cc @@ -13,6 +13,7 @@ #include "cycle.h" #include "dbox.h" #include "debug.h" +#include "delay.h" #include "draw.h" #include "game.h" #include "game_mouse.h" @@ -39,7 +40,6 @@ #include "window_manager.h" #include "word_wrap.h" #include "worldmap.h" -#include "delay.h" namespace fallout { @@ -2001,7 +2001,7 @@ static bool pipboyRest(int hours, int minutes, int duration) pipboyDrawNumber(gameTimeGetHour(), 4, PIPBOY_WINDOW_TIME_X, PIPBOY_WINDOW_TIME_Y); pipboyDrawDate(); windowRefresh(gPipboyWindow); - + delay_ms(50 - (getTicks() - start)); } diff --git a/src/preferences.cc b/src/preferences.cc index 8ccb6a5..9e93307 100644 --- a/src/preferences.cc +++ b/src/preferences.cc @@ -7,6 +7,7 @@ #include "combat.h" #include "combat_ai.h" #include "debug.h" +#include "delay.h" #include "draw.h" #include "game.h" #include "game_mouse.h" @@ -23,7 +24,6 @@ #include "text_font.h" #include "text_object.h" #include "window_manager.h" -#include "delay.h" namespace fallout { @@ -1570,7 +1570,7 @@ static void _DoThing(int eventCode) blitBufferToBufferTrans(_preferencesFrmImages[PREFERENCES_WINDOW_FRM_KNOB_ON].getData(), 21, 12, 21, gPreferencesWindowBuffer + PREFERENCES_WINDOW_WIDTH * meta->knobY + v31, PREFERENCES_WINDOW_WIDTH); windowRefresh(gPreferencesWindow); - + delay_ms(35 - (getTicks() - tick)); renderPresent(); diff --git a/src/vcr.cc b/src/vcr.cc index 8d56301..1f00e6b 100644 --- a/src/vcr.cc +++ b/src/vcr.cc @@ -2,12 +2,12 @@ #include +#include "delay.h" #include "input.h" #include "kb.h" #include "memory.h" #include "mouse.h" #include "svga.h" -#include "delay.h" namespace fallout {