Reorder includes

src/actions.cc

@@ -1,5 +1,8 @@
 #include "actions.h"
 
+#include <limits.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "color.h"
@@ -32,9 +35,6 @@
 #include "tile.h"
 #include "trait.h"
 
-#include <limits.h>
-#include <string.h>
-
 #define MAX_KNOCKDOWN_DISTANCE 20
 
 typedef enum ScienceRepairTargetType {

src/animation.cc

@@ -1,5 +1,8 @@
 #include "animation.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "art.h"
 #include "color.h"
 #include "combat.h"
@@ -28,9 +31,6 @@
 #include "tile.h"
 #include "trait.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #define ANIMATION_SEQUENCE_LIST_CAPACITY 32
 #define ANIMATION_DESCRIPTION_LIST_CAPACITY 55
 #define ANIMATION_SAD_LIST_CAPACITY 24

src/art.cc

@@ -1,5 +1,9 @@
 #include "art.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "animation.h"
 #include "debug.h"
 #include "draw.h"
@@ -10,10 +14,6 @@
 #include "proto.h"
 #include "sfall_config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct ArtListDescription {
     int flags;
     char name[16];

src/audio.cc

@@ -1,15 +1,15 @@
 #include "audio.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "db.h"
 #include "debug.h"
 #include "memory_manager.h"
 #include "pointer_registry.h"
 #include "sound.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
 static bool _defaultCompressionFunc(char* filePath);
 static int audioSoundDecoderReadHandler(int fileHandle, void* buf, unsigned int size);
 

src/audio_file.cc

@@ -1,15 +1,15 @@
 #include "audio_file.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "debug.h"
 #include "memory_manager.h"
 #include "platform_compat.h"
 #include "pointer_registry.h"
 #include "sound.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
 static bool _defaultCompressionFunc__(char* filePath);
 static int audioFileSoundDecoderReadHandler(int fileHandle, void* buffer, unsigned int size);
 

src/automap.cc

@@ -1,5 +1,10 @@
 #include "automap.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "color.h"
 #include "config.h"
@@ -20,11 +25,6 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-
 #define AUTOMAP_OFFSET_COUNT (AUTOMAP_MAP_COUNT * ELEVATION_COUNT)
 
 #define AUTOMAP_WINDOW_WIDTH (519)

src/cache.cc

@@ -1,14 +1,14 @@
 #include "cache.h"
 
-#include "debug.h"
-#include "memory.h"
-#include "sound.h"
-
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "debug.h"
+#include "memory.h"
+#include "sound.h"
+
 // The initial number of cache entries in new cache.
 #define CACHE_ENTRIES_INITIAL_CAPACITY (100)
 

src/character_editor.cc

@@ -1,5 +1,12 @@
 #include "character_editor.h"
 
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <vector>
+
 #include "art.h"
 #include "color.h"
 #include "combat.h"
@@ -35,13 +42,6 @@
 #include "word_wrap.h"
 #include "worldmap.h"
 
-#include <assert.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <vector>
-
 #define RENDER_ALL_STATS 7
 
 #define EDITOR_WINDOW_WIDTH 640

src/character_selector.cc

@@ -1,5 +1,11 @@
 #include "character_selector.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+#include <vector>
+
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
@@ -25,12 +31,6 @@
 #include "trait.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-#include <vector>
-
 #define CS_WINDOW_WIDTH (640)
 #define CS_WINDOW_HEIGHT (480)
 

src/color.cc

@@ -1,12 +1,12 @@
 #include "color.h"
 
-#include "core.h"
-
 #include <math.h>
 #include <string.h>
 
 #include <algorithm>
 
+#include "core.h"
+
 #define COLOR_PALETTE_STACK_CAPACITY 16
 
 typedef struct ColorPaletteStackEntry {

src/combat.cc

@@ -1,5 +1,9 @@
 #include "combat.h"
 
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -39,10 +43,6 @@
 #include "trait.h"
 #include "window_manager.h"
 
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
 #define CALLED_SHOT_WINDOW_Y (20)
 #define CALLED_SHOT_WINDOW_WIDTH (504)
 #define CALLED_SHOT_WINDOW_HEIGHT (309)

src/combat_ai.cc

@@ -1,5 +1,9 @@
 #include "combat_ai.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -30,10 +34,6 @@
 #include "text_object.h"
 #include "tile.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define AI_PACKET_CHEM_PRIMARY_DESIRE_COUNT (3)
 
 typedef struct AiMessageRange {

src/config.cc

@@ -1,9 +1,5 @@
 #include "config.h"
 
-#include "db.h"
-#include "memory.h"
-#include "platform_compat.h"
-
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
@@ -11,6 +7,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "db.h"
+#include "memory.h"
+#include "platform_compat.h"
+
 #define CONFIG_FILE_MAX_LINE_LENGTH (256)
 
 // The initial number of sections (or key-value) pairs in the config.

src/core.cc

@@ -1,5 +1,10 @@
 #include "core.h"
 
+#include <limits.h>
+#include <string.h>
+
+#include <SDL.h>
+
 #include "audio_engine.h"
 #include "color.h"
 #include "config.h"
@@ -13,10 +18,6 @@
 #include "window_manager.h"
 #include "window_manager_private.h"
 
-#include <SDL.h>
-#include <limits.h>
-#include <string.h>
-
 static void idleImpl();
 
 // 0x51E234

src/core.h

@@ -1,13 +1,13 @@
 #ifndef CORE_H
 #define CORE_H
 
+#include <SDL.h>
+
 #include "db.h"
 #include "dinput.h"
 #include "geometry.h"
 #include "window.h"
 
-#include <SDL.h>
-
 #define MOUSE_DEFAULT_CURSOR_WIDTH 8
 #define MOUSE_DEFAULT_CURSOR_HEIGHT 8
 #define MOUSE_DEFAULT_CURSOR_SIZE (MOUSE_DEFAULT_CURSOR_WIDTH * MOUSE_DEFAULT_CURSOR_HEIGHT)

src/credits.cc

@@ -1,5 +1,7 @@
 #include "credits.h"
 
+#include <string.h>
+
 #include "art.h"
 #include "color.h"
 #include "core.h"
@@ -16,8 +18,6 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <string.h>
-
 #define CREDITS_WINDOW_WIDTH (640)
 #define CREDITS_WINDOW_HEIGHT (480)
 #define CREDITS_WINDOW_SCROLLING_DELAY (38)

src/critter.cc

@@ -1,5 +1,8 @@
 #include "critter.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "character_editor.h"
@@ -28,9 +31,6 @@
 #include "trait.h"
 #include "worldmap.h"
 
-#include <stdio.h>
-#include <string.h>
-
 // Maximum length of dude's name length.
 #define DUDE_NAME_MAX_LENGTH (32)
 

src/db.cc

@@ -1,12 +1,12 @@
 #include "db.h"
 
-#include "platform_compat.h"
-#include "xfile.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "platform_compat.h"
+#include "xfile.h"
+
 typedef struct FileList {
     XList xlist;
     struct FileList* next;

src/db.h

@@ -1,11 +1,11 @@
 #ifndef DB_H
 #define DB_H
 
+#include <stddef.h>
+
 #include "memory_defs.h"
 #include "xfile.h"
 
-#include <stddef.h>
-
 typedef XFile File;
 typedef void FileReadProgressHandler();
 typedef char* StrdupProc(const char* string);

src/dbox.cc

@@ -1,5 +1,10 @@
 #include "dbox.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
@@ -14,11 +19,6 @@
 #include "window_manager.h"
 #include "word_wrap.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-
 #define FILE_DIALOG_LINE_COUNT 12
 
 #define FILE_DIALOG_DOUBLE_CLICK_DELAY 32

src/debug.cc

@@ -1,9 +1,5 @@
 #include "debug.h"
 
-#include "memory.h"
-#include "platform_compat.h"
-#include "window_manager_private.h"
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -14,6 +10,10 @@
 #include <windows.h>
 #endif
 
+#include "memory.h"
+#include "platform_compat.h"
+#include "window_manager_private.h"
+
 static int _debug_puts(char* string);
 static void _debug_clear();
 static int _debug_mono(char* string);

src/dfile.cc

@@ -1,14 +1,14 @@
 #include "dfile.h"
 
-#include "platform_compat.h"
-
-#include <fpattern.h>
-
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <fpattern.h>
+
+#include "platform_compat.h"
+
 // The size of decompression buffer for reading compressed [DFile]s.
 #define DFILE_DECOMPRESSION_BUFFER_SIZE (0x400)
 

src/dfile.h

@@ -1,11 +1,12 @@
 #ifndef DFILE_H
 #define DFILE_H
 
-#include "platform_compat.h"
-
 #include <stdio.h>
+
 #include <zlib.h>
 
+#include "platform_compat.h"
+
 typedef struct DBase DBase;
 typedef struct DBaseEntry DBaseEntry;
 typedef struct DFile DFile;

src/dialog.cc

@@ -1,5 +1,7 @@
 #include "dialog.h"
 
+#include <string.h>
+
 #include "core.h"
 #include "memory_manager.h"
 #include "movie.h"
@@ -7,8 +9,6 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <string.h>
-
 // 0x501623
 const float flt_501623 = 31.0;
 

src/dictionary.cc

@@ -1,11 +1,11 @@
 #include "dictionary.h"
 
-#include "platform_compat.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "platform_compat.h"
+
 // NOTE: I guess this marker is used as a type discriminator for implementing
 // nested dictionaries. That's why every dictionary-related function starts
 // with a check for this value.

src/dictionary.h

@@ -1,10 +1,10 @@
 #ifndef DICTIONARY_H
 #define DICTIONARY_H
 
-#include "memory_defs.h"
-
 #include <stdio.h>
 
+#include "memory_defs.h"
+
 typedef int(DictionaryReadProc)(FILE* stream, void* buffer, unsigned int size, int a4);
 typedef int(DictionaryWriteProc)(FILE* stream, void* buffer, unsigned int size, int a4);
 

src/display_monitor.cc

@@ -1,5 +1,9 @@
 #include "display_monitor.h"
 
+#include <string.h>
+
+#include <fstream>
+
 #include "art.h"
 #include "color.h"
 #include "combat.h"
@@ -14,10 +18,6 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <string.h>
-
-#include <fstream>
-
 // The maximum number of lines display monitor can hold. Once this value
 // is reached earlier messages are thrown away.
 #define DISPLAY_MONITOR_LINES_CAPACITY (100)

src/draw.cc

@@ -1,11 +1,11 @@
 #include "draw.h"
 
+#include <string.h>
+
 #include "color.h"
 #include "core.h"
 #include "mmx.h"
 
-#include <string.h>
-
 // 0x4D2FC0
 void bufferDrawLine(unsigned char* buf, int pitch, int x1, int y1, int x2, int y2, int color)
 {

src/electronic_registration.cc

@@ -1,13 +1,13 @@
 #include "electronic_registration.h"
 
-#include "game_config.h"
-#include "platform_compat.h"
-
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 
+#include "game_config.h"
+#include "platform_compat.h"
+
 // 0x440DD0
 void runElectronicRegistration()
 {

src/elevator.cc

@@ -1,5 +1,10 @@
 #include "elevator.h"
 
+#include <ctype.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "core.h"
 #include "cycle.h"
@@ -15,11 +20,6 @@
 #include "sfall_config.h"
 #include "window_manager.h"
 
-#include <ctype.h>
-#include <string.h>
-
-#include <algorithm>
-
 // The maximum number of elevator levels.
 #define ELEVATOR_LEVEL_MAX (4)
 

src/endgame.cc

@@ -1,5 +1,11 @@
 #include "endgame.h"
 
+#include <ctype.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "art.h"
 #include "color.h"
 #include "core.h"
@@ -27,12 +33,6 @@
 #include "word_wrap.h"
 #include "worldmap.h"
 
-#include <ctype.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
 // The maximum number of subtitle lines per slide.
 #define ENDGAME_ENDING_MAX_SUBTITLES (50)
 

src/export.cc

@@ -1,12 +1,12 @@
 #include "export.h"
 
+#include <ctype.h>
+#include <string.h>
+
 #include "interpreter_lib.h"
 #include "memory_manager.h"
 #include "platform_compat.h"
 
-#include <ctype.h>
-#include <string.h>
-
 typedef struct ExternalVariable {
     char name[32];
     char* programName;

src/file_find.cc

@@ -1,10 +1,10 @@
 #include "file_find.h"
 
-#include <fpattern.h>
-
 #include <stddef.h>
 #include <string.h>
 
+#include <fpattern.h>
+
 // 0x4E6380
 bool fileFindFirst(const char* path, DirectoryFileFindData* findData)
 {

src/file_find.h

@@ -1,8 +1,6 @@
 #ifndef FILE_FIND_H
 #define FILE_FIND_H
 
-#include "platform_compat.h"
-
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #define NOMINMAX
@@ -11,6 +9,8 @@
 #include <dirent.h>
 #endif
 
+#include "platform_compat.h"
+
 // NOTE: This structure is significantly different from what was in the
 // original code. Watcom provides opendir/readdir/closedir implementations,
 // that use Win32 FindFirstFile/FindNextFile under the hood, which in turn

src/file_utils.cc

@@ -2,7 +2,6 @@
 // of regular __usercall.
 
 #include "file_utils.h"
-#include "platform_compat.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -10,6 +9,8 @@
 
 #include <vector>
 
+#include "platform_compat.h"
+
 static void fileCopy(const char* existingFilePath, const char* newFilePath);
 
 // 0x452740

src/font_manager.cc

@@ -1,12 +1,12 @@
 #include "font_manager.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "color.h"
 #include "db.h"
 #include "memory_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
 // The maximum number of interface fonts.
 #define INTERFACE_FONT_MAX (16)
 

src/game.cc

@@ -1,5 +1,14 @@
 #include "game.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#ifdef _WIN32
+#include <io.h>
+#else
+#include <unistd.h> // access
+#endif
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -57,15 +66,6 @@
 #include "window_manager.h"
 #include "worldmap.h"
 
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h> // access
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
 #define HELP_SCREEN_WIDTH (640)
 #define HELP_SCREEN_HEIGHT (480)
 

src/game_config.cc

@@ -1,11 +1,11 @@
 #include "game_config.h"
 
-#include "main.h"
-#include "platform_compat.h"
-
 #include <stdio.h>
 #include <string.h>
 
+#include "main.h"
+#include "platform_compat.h"
+
 // A flag indicating if [gGameConfig] was initialized.
 //
 // 0x5186D0

src/game_dialog.cc

@@ -1,5 +1,9 @@
 #include "game_dialog.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -34,10 +38,6 @@
 #include "tile.h"
 #include "window_manager.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
 #define DIALOG_REVIEW_ENTRIES_CAPACITY 80
 
 #define DIALOG_OPTION_ENTRIES_CAPACITY 30

src/game_mouse.cc

@@ -1,5 +1,9 @@
 #include "game_mouse.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -23,10 +27,6 @@
 #include "tile.h"
 #include "window_manager.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
 typedef enum ScrollableDirections {
     SCROLLABLE_W = 0x01,
     SCROLLABLE_E = 0x02,

src/game_movie.cc

@@ -1,5 +1,8 @@
 #include "game_movie.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "color.h"
 #include "core.h"
 #include "cycle.h"
@@ -15,9 +18,6 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #define GAME_MOVIE_WINDOW_WIDTH 640
 #define GAME_MOVIE_WINDOW_HEIGHT 480
 

src/game_sound.cc

@@ -1,5 +1,8 @@
 #include "game_sound.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "audio.h"
@@ -21,9 +24,6 @@
 #include "window_manager.h"
 #include "worldmap.h"
 
-#include <stdio.h>
-#include <string.h>
-
 typedef enum SoundEffectActionType {
     SOUND_EFFECT_ACTION_TYPE_ACTIVE,
     SOUND_EFFECT_ACTION_TYPE_PASSIVE,

src/geometry.cc

@@ -1,9 +1,10 @@
 #include "geometry.h"
 
-#include "memory.h"
+#include <stdlib.h>
 
 #include <algorithm>
-#include <stdlib.h>
+
+#include "memory.h"
 
 // 0x51DEF4
 static RectListNode* _rectList = NULL;

src/graph_lib.cc

@@ -1,10 +1,10 @@
 #include "graph_lib.h"
 
+#include <string.h>
+
 #include "debug.h"
 #include "memory.h"
 
-#include <string.h>
-
 static void _InitTree();
 static void _InsertNode(int a1);
 static void _DeleteNode(int a1);

src/grayscale.cc

@@ -1,9 +1,9 @@
 #include "grayscale.h"
 
-#include "color.h"
-
 #include <algorithm>
 
+#include "color.h"
+
 // 0x596D90
 static unsigned char _GreyTable[256];
 

src/heap.cc

@@ -1,12 +1,12 @@
 #include "heap.h"
 
-#include "debug.h"
-#include "memory.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "debug.h"
+#include "memory.h"
+
 #define HEAP_BLOCK_HEADER_GUARD (0xDEADC0DE)
 #define HEAP_BLOCK_FOOTER_GUARD (0xACDCACDC)
 

src/interface.cc

@@ -1,5 +1,8 @@
 #include "interface.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "color.h"
@@ -30,9 +33,6 @@
 #include "tile.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
 // The width of connectors in the indicator box.
 //
 // There are male connectors on the left, and female connectors on the right.

src/interpreter.cc

@@ -1,5 +1,12 @@
 #include "interpreter.h"
 
+#include <assert.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "core.h"
 #include "db.h"
 #include "debug.h"
@@ -8,13 +15,6 @@
 #include "memory_manager.h"
 #include "platform_compat.h"
 
-#include <assert.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct ProgramListNode {
     Program* program;
     struct ProgramListNode* next; // next

src/interpreter_extra.cc

@@ -1,5 +1,9 @@
 #include "interpreter_extra.h"
 
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -40,10 +44,6 @@
 #include "trait.h"
 #include "worldmap.h"
 
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
 typedef enum ScriptError {
     SCRIPT_ERROR_NOT_IMPLEMENTED,
     SCRIPT_ERROR_OBJECT_IS_NULL,

src/inventory.cc

@@ -1,5 +1,11 @@
 #include "inventory.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -37,12 +43,6 @@
 #include "tile.h"
 #include "window_manager.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-
 #define INVENTORY_WINDOW_X 80
 #define INVENTORY_WINDOW_Y 0
 

src/item.cc

@@ -1,5 +1,10 @@
 #include "item.h"
 
+#include <string.h>
+
+#include <algorithm>
+#include <vector>
+
 #include "animation.h"
 #include "art.h"
 #include "automap.h"
@@ -28,11 +33,6 @@
 #include "tile.h"
 #include "trait.h"
 
-#include <string.h>
-
-#include <algorithm>
-#include <vector>
-
 #define ADDICTION_COUNT (9)
 
 // Max number of books that can be loaded from books.ini. This limit is imposed

src/light.cc

@@ -1,12 +1,12 @@
 #include "light.h"
 
+#include <math.h>
+
 #include "map_defs.h"
 #include "object.h"
 #include "perk.h"
 #include "tile.h"
 
-#include <math.h>
-
 // 20% of max light per "Night Vision" rank
 #define LIGHT_LEVEL_NIGHT_VISION_BONUS (65536 / 5)
 

src/lips.cc

@@ -1,5 +1,8 @@
 #include "lips.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "audio.h"
 #include "core.h"
 #include "db.h"
@@ -9,9 +12,6 @@
 #include "platform_compat.h"
 #include "sound.h"
 
-#include <stdio.h>
-#include <string.h>
-
 static char* _lips_fix_string(const char* fileName, size_t length);
 static int lipsReadV1(LipsData* a1, File* stream);
 static int _lips_make_speech();

src/lips.h

@@ -1,10 +1,10 @@
 #ifndef LIPS_H
 #define LIPS_H
 
-#include "sound.h"
-
 #include <stddef.h>
 
+#include "sound.h"
+
 #define PHONEME_COUNT (42)
 
 typedef enum LipsFlags {

src/loadsave.cc

@@ -1,5 +1,12 @@
 #include "loadsave.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "automap.h"
 #include "character_editor.h"
@@ -46,13 +53,6 @@
 #include "word_wrap.h"
 #include "worldmap.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include <algorithm>
-
 #define LS_WINDOW_WIDTH 640
 #define LS_WINDOW_HEIGHT 480
 

src/main.cc

@@ -1,5 +1,9 @@
 #include "main.h"
 
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
+
 #include "art.h"
 #include "autorun.h"
 #include "character_selector.h"
@@ -36,10 +40,6 @@
 #include "word_wrap.h"
 #include "worldmap.h"
 
-#include <ctype.h>
-#include <limits.h>
-#include <string.h>
-
 #define MAIN_MENU_WINDOW_WIDTH 640
 #define MAIN_MENU_WINDOW_HEIGHT 480
 

src/map.cc

@@ -1,5 +1,8 @@
 #include "map.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "automap.h"
@@ -37,9 +40,6 @@
 #include "window_manager_private.h"
 #include "worldmap.h"
 
-#include <stdio.h>
-#include <string.h>
-
 static char* mapBuildPath(char* name);
 static int mapLoad(File* stream);
 static int _map_age_dead_critters();

src/memory.cc

@@ -1,11 +1,11 @@
 #include "memory.h"
 
-#include "debug.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "debug.h"
+
 // A special value that denotes a beginning of a memory block data.
 #define MEMORY_BLOCK_HEADER_GUARD (0xFEEDFACE)
 

src/message.cc

@@ -1,5 +1,10 @@
 #include "message.h"
 
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "debug.h"
 #include "game_config.h"
 #include "memory.h"
@@ -8,11 +13,6 @@
 #include "random.h"
 #include "sfall_config.h"
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define BADWORD_LENGTH_MAX 80
 
 static bool _message_find(MessageList* msg, int num, int* out_index);

src/mmx.cc

@@ -1,9 +1,9 @@
 #include "mmx.h"
 
-#include "core.h"
-
 #include <string.h>
 
+#include "core.h"
+
 // Return `true` if CPU supports MMX.
 //
 // 0x4E08A0

src/mouse_manager.cc

@@ -1,5 +1,7 @@
 #include "mouse_manager.h"
 
+#include <string.h>
+
 #include "core.h"
 #include "datafile.h"
 #include "db.h"
@@ -7,8 +9,6 @@
 #include "memory_manager.h"
 #include "platform_compat.h"
 
-#include <string.h>
-
 // 0x5195A8
 MouseManagerNameMangler* gMouseManagerNameMangler = mouseManagerNameManglerDefaultImpl;
 

src/movie.cc

@@ -1,5 +1,9 @@
 #include "movie.h"
 
+#include <string.h>
+
+#include <SDL.h>
+
 #include "color.h"
 #include "core.h"
 #include "db.h"
@@ -17,10 +21,6 @@
 #include "window.h"
 #include "window_manager.h"
 
-#include <string.h>
-
-#include <SDL.h>
-
 typedef struct MovieSubtitleListNode {
     int num;
     char* text;

src/movie_effect.cc

@@ -1,5 +1,9 @@
 #include "movie_effect.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "config.h"
 #include "debug.h"
 #include "memory.h"
@@ -7,10 +11,6 @@
 #include "palette.h"
 #include "platform_compat.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef enum MovieEffectType {
     MOVIE_EFFECT_TYPE_NONE = 0,
     MOVIE_EFFECT_TYPE_FADE_IN = 1,

src/movie_lib.cc

@@ -4,13 +4,13 @@
 
 #include "movie_lib.h"
 
-#include "audio_engine.h"
-#include "platform_compat.h"
-
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "audio_engine.h"
+#include "platform_compat.h"
+
 typedef struct STRUCT_6B3690 {
     void* field_0;
     unsigned int field_4;

src/movie_lib.h

@@ -1,10 +1,10 @@
 #ifndef MOVIE_LIB_H
 #define MOVIE_LIB_H
 
-#include "memory_defs.h"
-
 #include <SDL.h>
 
+#include "memory_defs.h"
+
 typedef bool MovieReadProc(int fileHandle, void* buffer, int count);
 typedef void(MovieShowFrameProc)(SDL_Surface*, int, int, int, int, int, int, int, int);
 

src/nevs.cc

@@ -1,13 +1,13 @@
 #include "nevs.h"
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "debug.h"
 #include "interpreter_lib.h"
 #include "memory_manager.h"
 #include "platform_compat.h"
 
-#include <stdlib.h>
-#include <string.h>
-
 #define NEVS_COUNT 40
 
 typedef struct Nevs {

src/object.cc

@@ -1,5 +1,8 @@
 #include "object.h"
 
+#include <assert.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "color.h"
@@ -23,9 +26,6 @@
 #include "tile.h"
 #include "worldmap.h"
 
-#include <assert.h>
-#include <string.h>
-
 static int objectLoadAllInternal(File* stream);
 static void _obj_fix_combat_cid_for_dude();
 static void _object_fix_weapon_ammo(Object* obj);

src/options.cc

@@ -1,5 +1,11 @@
 #include "options.h"
 
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "color.h"
 #include "combat.h"
@@ -24,12 +30,6 @@
 #include "tile.h"
 #include "window_manager.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-
 #define PREFERENCES_WINDOW_WIDTH 640
 #define PREFERENCES_WINDOW_HEIGHT 480
 

src/palette.cc

@@ -1,13 +1,13 @@
 #include "palette.h"
 
+#include <string.h>
+
 #include "color.h"
 #include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "game_sound.h"
 
-#include <string.h>
-
 static void _palette_reset_();
 
 // 0x6639D0

src/party_member.cc

@@ -1,5 +1,9 @@
 #include "party_member.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "animation.h"
 #include "color.h"
 #include "combat_ai.h"
@@ -28,10 +32,6 @@
 #include "tile.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct PartyMemberDescription {
     bool areaAttackMode[AREA_ATTACK_MODE_COUNT];
     bool runAwayMode[RUN_AWAY_MODE_COUNT];

src/perk.cc

@@ -1,5 +1,7 @@
 #include "perk.h"
 
+#include <stdio.h>
+
 #include "debug.h"
 #include "game.h"
 #include "game_config.h"
@@ -11,8 +13,6 @@
 #include "skill.h"
 #include "stat.h"
 
-#include <stdio.h>
-
 typedef struct PerkDescription {
     char* name;
     char* description;

src/pipboy.cc

@@ -1,5 +1,9 @@
 #include "pipboy.h"
 
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "art.h"
 #include "automap.h"
 #include "color.h"
@@ -33,10 +37,6 @@
 #include "word_wrap.h"
 #include "worldmap.h"
 
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-
 #define PIPBOY_WINDOW_WIDTH (640)
 #define PIPBOY_WINDOW_HEIGHT (480)
 

src/platform_compat.cc

@@ -1,6 +1,5 @@
 #include "platform_compat.h"
 
-#include <SDL.h>
 #include <string.h>
 
 #ifdef _WIN32
@@ -25,6 +24,8 @@
 #include <chrono>
 #endif
 
+#include <SDL.h>
+
 int compat_stricmp(const char* string1, const char* string2)
 {
     return SDL_strcasecmp(string1, string2);

src/proto.cc

@@ -1,5 +1,8 @@
 #include "proto.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "art.h"
 #include "character_editor.h"
 #include "combat.h"
@@ -19,9 +22,6 @@
 #include "stat.h"
 #include "trait.h"
 
-#include <stdio.h>
-#include <string.h>
-
 static int _proto_critter_init(Proto* a1, int a2);
 static int objectCritterCombatDataRead(CritterCombatData* data, File* stream);
 static int objectCritterCombatDataWrite(CritterCombatData* data, File* stream);

src/proto_instance.cc

@@ -1,5 +1,10 @@
 #include "proto_instance.h"
 
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "color.h"
@@ -27,11 +32,6 @@
 #include "tile.h"
 #include "worldmap.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 static int _obj_remove_from_inven(Object* critter, Object* item);
 static int _obj_use_book(Object* item_obj);
 static int _obj_use_flare(Object* critter_obj, Object* item_obj);

src/random.cc

@@ -1,13 +1,13 @@
 #include "random.h"
 
+#include <limits.h>
+#include <stdlib.h>
+
 #include "debug.h"
 #include "platform_compat.h"
 #include "scripts.h"
 #include "sfall_config.h"
 
-#include <limits.h>
-#include <stdlib.h>
-
 static int _roll_reset_();
 static int randomTranslateRoll(int delta, int criticalSuccessModifier);
 static int getRandom(int max);

src/region.cc

@@ -1,11 +1,11 @@
 #include "region.h"
 
-#include "debug.h"
-#include "memory_manager.h"
-
 #include <limits.h>
 #include <string.h>
 
+#include "debug.h"
+#include "memory_manager.h"
+
 // 0x50D394
 static char _aNull[] = "<null>";
 

src/scripts.cc

@@ -1,5 +1,10 @@
 #include "scripts.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
 #include "actions.h"
 #include "animation.h"
 #include "art.h"
@@ -30,11 +35,6 @@
 #include "window_manager_private.h"
 #include "worldmap.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
 #define SCRIPT_LIST_EXTENT_SIZE 16
 
 // SFALL: Increase number of message lists for scripted dialogs.

src/select_file_list.cc

@@ -1,10 +1,10 @@
 #include "select_file_list.h"
 
-#include "db.h"
-
 #include <stdlib.h>
 #include <string.h>
 
+#include "db.h"
+
 // 0x4AA250
 int _compare(const void* a1, const void* a2)
 {

src/selfrun.cc

@@ -1,13 +1,13 @@
 #include "selfrun.h"
 
+#include <stdlib.h>
+
 #include "core.h"
 #include "db.h"
 #include "game.h"
 #include "game_config.h"
 #include "platform_compat.h"
 
-#include <stdlib.h>
-
 // 0x51C8D8
 int gSelfrunState = SELFRUN_STATE_TURNED_OFF;
 

src/sfall_config.cc

@@ -1,10 +1,10 @@
 #include "sfall_config.h"
 
-#include "platform_compat.h"
-
 #include <stdio.h>
 #include <string.h>
 
+#include "platform_compat.h"
+
 #define SFALL_CONFIG_FILE_NAME "ddraw.ini"
 
 bool gSfallConfigInitialized = false;

src/skill.cc

@@ -1,5 +1,9 @@
 #include "skill.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "actions.h"
 #include "color.h"
 #include "combat.h"
@@ -23,10 +27,6 @@
 #include "stat.h"
 #include "trait.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define SKILLS_MAX_USES_PER_DAY (3)
 
 #define REPAIRABLE_DAMAGE_FLAGS_LENGTH (5)

src/skilldex.cc

@@ -1,5 +1,8 @@
 #include "skilldex.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "art.h"
 #include "color.h"
 #include "core.h"
@@ -20,9 +23,6 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
 #define SKILLDEX_WINDOW_RIGHT_MARGIN 4
 #define SKILLDEX_WINDOW_BOTTOM_MARGIN 6
 

src/sound.cc

@@ -1,8 +1,9 @@
 #include "sound.h"
 
-#include "audio_engine.h"
+#include <limits.h>
-#include "debug.h"
+#include <math.h>
-#include "platform_compat.h"
+#include <stdlib.h>
+#include <string.h>
 
 #ifdef _WIN32
 #include <io.h>
@@ -10,15 +11,15 @@
 #include <fcntl.h>
 #include <unistd.h>
 #endif
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <algorithm>
 
 #include <SDL.h>
 
+#include "audio_engine.h"
+#include "debug.h"
+#include "platform_compat.h"
+
 #define SOUND_FLAG_SOUND_IS_DONE (0x01)
 #define SOUND_FLAG_SOUND_IS_PLAYING (0x02)
 #define SOUND_FLAG_SOUND_IS_FADING (0x04)

src/sound_effects_cache.cc

@@ -1,5 +1,11 @@
 #include "sound_effects_cache.h"
 
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "cache.h"
 #include "db.h"
 #include "game_config.h"
@@ -7,12 +13,6 @@
 #include "sound_decoder.h"
 #include "sound_effects_list.h"
 
-#include <assert.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define SOUND_EFFECTS_CACHE_MIN_SIZE (0x40000)
 
 typedef struct SoundEffect {

src/sound_effects_list.cc

@@ -1,5 +1,10 @@
 #include "sound_effects_list.h"
 
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "db.h"
 #include "debug.h"
 #include "memory.h"
@@ -7,11 +12,6 @@
 #include "pointer_registry.h"
 #include "sound_decoder.h"
 
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct SoundEffectsListEntry {
     char* name;
     int dataSize;

src/stat.cc

@@ -1,5 +1,9 @@
 #include "stat.h"
 
+#include <stdio.h>
+
+#include <algorithm>
+
 #include "art.h"
 #include "combat.h"
 #include "core.h"
@@ -22,10 +26,6 @@
 #include "tile.h"
 #include "trait.h"
 
-#include <stdio.h>
-
-#include <algorithm>
-
 // Provides metadata about stats.
 typedef struct StatDescription {
     char* name;

src/string_parsers.cc

@@ -1,11 +1,11 @@
 #include "string_parsers.h"
 
-#include "debug.h"
-#include "platform_compat.h"
-
 #include <stdlib.h>
 #include <string.h>
 
+#include "debug.h"
+#include "platform_compat.h"
+
 // strParseInt
 // 0x4AFD10
 int strParseInt(char** stringPtr, int* valuePtr)

src/text_font.cc

@@ -1,13 +1,13 @@
 #include "text_font.h"
 
+#include <stdio.h>
+#include <string.h>
+
 #include "color.h"
 #include "db.h"
 #include "memory.h"
 #include "platform_compat.h"
 
-#include <stdio.h>
-#include <string.h>
-
 // The maximum number of text fonts.
 #define TEXT_FONT_MAX (10)
 

src/text_object.cc

@@ -1,5 +1,7 @@
 #include "text_object.h"
 
+#include <string.h>
+
 #include "core.h"
 #include "debug.h"
 #include "draw.h"
@@ -10,8 +12,6 @@
 #include "tile.h"
 #include "word_wrap.h"
 
-#include <string.h>
-
 // The maximum number of text objects that can exist at the same time.
 #define TEXT_OBJECTS_MAX_COUNT (20)
 

src/tile.cc

@@ -1,5 +1,9 @@
 #include "tile.h"
 
+#include <assert.h>
+#include <math.h>
+#include <string.h>
+
 #include "art.h"
 #include "color.h"
 #include "config.h"
@@ -13,10 +17,6 @@
 #include "object.h"
 #include "platform_compat.h"
 
-#include <assert.h>
-#include <math.h>
-#include <string.h>
-
 typedef struct STRUCT_51D99C {
     int field_0;
     int field_4;

src/trait.cc

@@ -1,5 +1,7 @@
 #include "trait.h"
 
+#include <stdio.h>
+
 #include "game.h"
 #include "message.h"
 #include "object.h"
@@ -7,8 +9,6 @@
 #include "skill.h"
 #include "stat.h"
 
-#include <stdio.h>
-
 // Provides metadata about traits.
 typedef struct TraitDescription {
     // The name of trait.

src/win32.cc

@@ -1,12 +1,13 @@
 #include "win32.h"
 
+#include <stdlib.h>
+
+#include <SDL.h>
+
 #include "core.h"
 #include "main.h"
 #include "window_manager.h"
 
-#include <SDL.h>
-#include <stdlib.h>
-
 #ifdef _WIN32
 // 0x51E444
 bool gProgramIsActive = false;

src/window.cc

@@ -1,5 +1,9 @@
 #include "window.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "color.h"
 #include "core.h"
 #include "datafile.h"
@@ -14,10 +18,6 @@
 #include "widget.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #define MANAGED_WINDOW_COUNT (16)
 
 typedef struct ManagedButton {

src/window_manager.cc

@@ -1,5 +1,11 @@
 #include "window_manager.h"
 
+#include <string.h>
+
+#include <algorithm>
+
+#include <SDL.h>
+
 #include "color.h"
 #include "core.h"
 #include "debug.h"
@@ -11,11 +17,6 @@
 #include "win32.h"
 #include "window_manager_private.h"
 
-#include <SDL.h>
-#include <string.h>
-
-#include <algorithm>
-
 #define MAX_WINDOW_COUNT (50)
 
 // The maximum number of radio groups.

src/window_manager.h

@@ -1,8 +1,6 @@
 #ifndef WINDOW_MANAGER_H
 #define WINDOW_MANAGER_H
 
-#include "geometry.h"
-
 #include <stddef.h>
 
 #ifdef _WIN32
@@ -11,6 +9,8 @@
 #include <windows.h>
 #endif
 
+#include "geometry.h"
+
 // The maximum number of buttons in one radio group.
 #define RADIO_GROUP_BUTTON_LIST_CAPACITY (64)
 

src/window_manager_private.cc

@@ -1,5 +1,10 @@
 #include "window_manager_private.h"
 
+#include <stdio.h>
+#include <string.h>
+
+#include <algorithm>
+
 #include "color.h"
 #include "core.h"
 #include "draw.h"
@@ -7,11 +12,6 @@
 #include "text_font.h"
 #include "window_manager.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <algorithm>
-
 typedef struct STRUCT_6B2340 {
     int field_0;
     int field_4;

src/word_wrap.cc

@@ -1,11 +1,11 @@
 #include "word_wrap.h"
 
-#include "text_font.h"
-
 #include <ctype.h>
 #include <stddef.h>
 #include <string.h>
 
+#include "text_font.h"
+
 // 0x4BC6F0
 int wordWrap(const char* string, int width, short* breakpoints, short* breakpointsLengthPtr)
 {

src/worldmap.cc

@@ -1,5 +1,11 @@
 #include "worldmap.h"
 
+#include <assert.h>
+#include <ctype.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "animation.h"
 #include "art.h"
 #include "automap.h"
@@ -37,12 +43,6 @@
 #include "tile.h"
 #include "window_manager.h"
 
-#include <assert.h>
-#include <ctype.h>
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
 #define CITY_NAME_SIZE (40)
 #define TILE_WALK_MASK_NAME_SIZE (40)
 #define ENTRANCE_LIST_CAPACITY (10)

src/xfile.cc

@@ -1,16 +1,17 @@
 #include "xfile.h"
 
-#include "file_find.h"
-
 #include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #ifdef _WIN32
 #include <direct.h>
 #else
 #include <unistd.h>
 #endif
-#include <stdio.h>
+
-#include <stdlib.h>
+#include "file_find.h"
-#include <string.h>
 
 typedef enum XFileEnumerationEntryType {
     XFILE_ENUMERATION_ENTRY_TYPE_FILE,