clang-format

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 {
 

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 {
 

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 {
 

src/delay.cc

@@ -1,8 +1,10 @@
 #include "delay.h"
+
 #include <SDL.h>
 
-void delay_ms(int ms) {
+void delay_ms(int ms)
-    if (ms <= 0){
+{
+    if (ms <= 0) {
         return;
     }
     SDL_Delay(ms);

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 {
 

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 {
 

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 {
 

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 {
 

src/movie_lib.cc

@@ -9,8 +9,8 @@
 #include <string.h>
 
 #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            
+#ifdef EMSCRIPTEN
-            delay_ms(1);
+        delay_ms(1);
-        #endif
+#endif
     }
 
     if (dword_6B3660 != dword_6B3AE4) {
@@ -1327,7 +1327,7 @@ static int _syncWaitLevel(int a1)
     do {
         result = v2 + 1000 * compat_timeGetTime();
         if (result < 0) {
-            delay_ms(-result/1000 - 3);           
+            delay_ms(-result / 1000 - 3);
         }
         result = v2 + 1000 * compat_timeGetTime();
     } while (result < 0);

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 {
 

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 {
 

src/vcr.cc

@@ -2,12 +2,12 @@
 
 #include <stdlib.h>
 
+#include "delay.h"
 #include "input.h"
 #include "kb.h"
 #include "memory.h"
 #include "mouse.h"
 #include "svga.h"
-#include "delay.h"
 
 namespace fallout {