diff --git a/src/actions.h b/src/actions.h index 412e360..f64e775 100644 --- a/src/actions.h +++ b/src/actions.h @@ -5,8 +5,6 @@ #include "obj_types.h" #include "proto_types.h" -#include - extern int _action_in_explode; extern const int gNormalDeathAnimations[DAMAGE_TYPE_COUNT]; extern const int gMaximumBloodDeathAnimations[DAMAGE_TYPE_COUNT]; diff --git a/src/animation.h b/src/animation.h index 1a16828..d545c53 100644 --- a/src/animation.h +++ b/src/animation.h @@ -6,8 +6,6 @@ #include "obj_types.h" #include "sound.h" -#include - #define ANIMATION_SEQUENCE_LIST_CAPACITY (32) #define ANIMATION_DESCRIPTION_LIST_CAPACITY (55) diff --git a/src/audio_file.h b/src/audio_file.h index 59f7504..fa10b08 100644 --- a/src/audio_file.h +++ b/src/audio_file.h @@ -3,8 +3,6 @@ #include "sound_decoder.h" -#include - typedef enum AudioFileFlags { AUDIO_FILE_IN_USE = 0x01, AUDIO_FILE_COMPRESSED = 0x02, diff --git a/src/automap.h b/src/automap.h index 5d669f3..647874b 100644 --- a/src/automap.h +++ b/src/automap.h @@ -4,8 +4,6 @@ #include "db.h" #include "map_defs.h" -#include - #define AUTOMAP_DB ("AUTOMAP.DB") #define AUTOMAP_TMP ("AUTOMAP.TMP") diff --git a/src/autorun.h b/src/autorun.h index 44a718e..ba84d7e 100644 --- a/src/autorun.h +++ b/src/autorun.h @@ -1,8 +1,6 @@ #ifndef AUTORUN_H #define AUTORUN_H -#include - #define WIN32_LEAN_AND_MEAN #include diff --git a/src/cache.h b/src/cache.h index dfe371a..31cca22 100644 --- a/src/cache.h +++ b/src/cache.h @@ -3,8 +3,6 @@ #include "heap.h" -#include - #define INVALID_CACHE_ENTRY ((CacheEntry*)-1) // The initial number of cache entries in new cache. diff --git a/src/character_selector.h b/src/character_selector.h index 257bf7e..014531e 100644 --- a/src/character_selector.h +++ b/src/character_selector.h @@ -3,8 +3,6 @@ #include "art.h" -#include - #define CS_WINDOW_WIDTH (640) #define CS_WINDOW_HEIGHT (480) diff --git a/src/color.h b/src/color.h index fd6b7cb..0ad16c7 100644 --- a/src/color.h +++ b/src/color.h @@ -3,7 +3,6 @@ #include "memory_defs.h" -#include #include typedef char*(ColorFileNameManger)(char*); diff --git a/src/combat_ai.h b/src/combat_ai.h index 521e566..e884cd5 100644 --- a/src/combat_ai.h +++ b/src/combat_ai.h @@ -8,8 +8,6 @@ #include "obj_types.h" #include "party_member.h" -#include - #define AI_PACKET_CHEM_PRIMARY_DESIRE_COUNT (3) typedef enum AiMessageType { diff --git a/src/config.h b/src/config.h index 09dabf5..34a5488 100644 --- a/src/config.h +++ b/src/config.h @@ -3,8 +3,6 @@ #include "dictionary.h" -#include - #define CONFIG_FILE_MAX_LINE_LENGTH (256) // The initial number of sections (or key-value) pairs in the config. diff --git a/src/core.h b/src/core.h index c934568..0bf9188 100644 --- a/src/core.h +++ b/src/core.h @@ -8,8 +8,6 @@ #include -#include - #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) diff --git a/src/credits.h b/src/credits.h index 2eace56..e416225 100644 --- a/src/credits.h +++ b/src/credits.h @@ -3,8 +3,6 @@ #include "db.h" -#include - #define CREDITS_WINDOW_WIDTH (640) #define CREDITS_WINDOW_HEIGHT (480) #define CREDITS_WINDOW_SCROLLING_DELAY (38) diff --git a/src/critter.h b/src/critter.h index 5c84789..9849222 100644 --- a/src/critter.h +++ b/src/critter.h @@ -6,8 +6,6 @@ #include "obj_types.h" #include "proto_types.h" -#include - // Maximum length of dude's name length. #define DUDE_NAME_MAX_LENGTH (32) diff --git a/src/cycle.h b/src/cycle.h index 4c3e7c5..5cc6b4c 100644 --- a/src/cycle.h +++ b/src/cycle.h @@ -1,8 +1,6 @@ #ifndef CYCLE_H #define CYCLE_H -#include - #define COLOR_CYCLE_PERIOD_1 (200U) #define COLOR_CYCLE_PERIOD_2 (142U) #define COLOR_CYCLE_PERIOD_3 (100U) diff --git a/src/db.h b/src/db.h index 0d9e45e..6d4ce6e 100644 --- a/src/db.h +++ b/src/db.h @@ -4,7 +4,6 @@ #include "memory_defs.h" #include "xfile.h" -#include #include typedef XFile File; diff --git a/src/dfile.h b/src/dfile.h index c831d61..54e5b2d 100644 --- a/src/dfile.h +++ b/src/dfile.h @@ -4,7 +4,6 @@ #define WIN32_LEAN_AND_MEAN #include -#include #include #include diff --git a/src/dictionary.cc b/src/dictionary.cc index 39ca87f..2cb9252 100644 --- a/src/dictionary.cc +++ b/src/dictionary.cc @@ -1,7 +1,6 @@ #include "dictionary.h" #include -#include #include #include diff --git a/src/display_monitor.h b/src/display_monitor.h index 038bc75..db72546 100644 --- a/src/display_monitor.h +++ b/src/display_monitor.h @@ -3,8 +3,6 @@ #include "geometry.h" -#include - // 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) diff --git a/src/endgame.h b/src/endgame.h index eb841cd..b3a2bdb 100644 --- a/src/endgame.h +++ b/src/endgame.h @@ -5,8 +5,6 @@ #define WIN32_LEAN_AND_MEAN #include -#include - typedef enum EndgameDeathEndingReason { // Dude died. ENDGAME_DEATH_ENDING_REASON_DEATH = 0, diff --git a/src/file_find.h b/src/file_find.h index 10490d9..0dbb552 100644 --- a/src/file_find.h +++ b/src/file_find.h @@ -1,8 +1,6 @@ #ifndef FILE_FIND_H #define FILE_FIND_H -#include - #define WIN32_LEAN_AND_MEAN #include diff --git a/src/file_utils.cc b/src/file_utils.cc index 52bde9f..725eb62 100644 --- a/src/file_utils.cc +++ b/src/file_utils.cc @@ -3,7 +3,6 @@ #include "file_utils.h" -#include #include #include diff --git a/src/font_manager.h b/src/font_manager.h index c6117dd..42b1230 100644 --- a/src/font_manager.h +++ b/src/font_manager.h @@ -3,8 +3,6 @@ #include "text_font.h" -#include - // The maximum number of interface fonts. #define INTERFACE_FONT_MAX (16) diff --git a/src/game.h b/src/game.h index 0959aa6..532258c 100644 --- a/src/game.h +++ b/src/game.h @@ -4,8 +4,6 @@ #include "game_vars.h" #include "message.h" -#include - extern char _aGame_0[]; extern bool gGameUiDisabled; diff --git a/src/game_config.h b/src/game_config.h index 784d339..5f5e11f 100644 --- a/src/game_config.h +++ b/src/game_config.h @@ -3,8 +3,6 @@ #include "config.h" -#include - // The file name of the main config file. #define GAME_CONFIG_FILE_NAME "fallout2.cfg" diff --git a/src/game_dialog.h b/src/game_dialog.h index d299d04..7b98253 100644 --- a/src/game_dialog.h +++ b/src/game_dialog.h @@ -8,8 +8,6 @@ #include "message.h" #include "obj_types.h" -#include - #define DIALOG_REVIEW_ENTRIES_CAPACITY 80 #define DIALOG_OPTION_ENTRIES_CAPACITY 30 diff --git a/src/game_mouse.h b/src/game_mouse.h index 2f68658..82106dd 100644 --- a/src/game_mouse.h +++ b/src/game_mouse.h @@ -5,8 +5,6 @@ #include "geometry.h" #include "obj_types.h" -#include - typedef enum ScrollableDirections { SCROLLABLE_W = 0x01, SCROLLABLE_E = 0x02, diff --git a/src/game_movie.h b/src/game_movie.h index 88a70b6..fb574ec 100644 --- a/src/game_movie.h +++ b/src/game_movie.h @@ -3,8 +3,6 @@ #include "db.h" -#include - #define WIN32_LEAN_AND_MEAN #include diff --git a/src/game_sound.cc b/src/game_sound.cc index 132f396..461a661 100644 --- a/src/game_sound.cc +++ b/src/game_sound.cc @@ -21,7 +21,6 @@ #include "window_manager.h" #include "world_map.h" -#include #include #include diff --git a/src/game_sound.h b/src/game_sound.h index 87aa6a1..bb23ac8 100644 --- a/src/game_sound.h +++ b/src/game_sound.h @@ -4,8 +4,6 @@ #include "obj_types.h" #include "sound.h" -#include - #define WIN32_LEAN_AND_MEAN #include diff --git a/src/heap.h b/src/heap.h index 4795fae..fdd78d7 100644 --- a/src/heap.h +++ b/src/heap.h @@ -1,8 +1,6 @@ #ifndef HEAP_H #define HEAP_H -#include - #define HEAP_BLOCK_HEADER_GUARD (0xDEADC0DE) #define HEAP_BLOCK_FOOTER_GUARD (0xACDCACDC) diff --git a/src/interface.h b/src/interface.h index b7f3141..ef9fed5 100644 --- a/src/interface.h +++ b/src/interface.h @@ -6,8 +6,6 @@ #include "geometry.h" #include "obj_types.h" -#include - typedef enum Hand { // Item1 (Punch) HAND_LEFT, diff --git a/src/interpreter.h b/src/interpreter.h index ef92cfe..beee1bf 100644 --- a/src/interpreter.h +++ b/src/interpreter.h @@ -2,7 +2,6 @@ #define INTERPRETER_H #include -#include // The maximum number of opcodes. #define OPCODE_MAX_COUNT (342) diff --git a/src/interpreter_extra.h b/src/interpreter_extra.h index e1362ce..2f7a4f5 100644 --- a/src/interpreter_extra.h +++ b/src/interpreter_extra.h @@ -6,8 +6,6 @@ #include "interpreter.h" #include "obj_types.h" -#include - typedef enum ScriptError { SCRIPT_ERROR_NOT_IMPLEMENTED, SCRIPT_ERROR_OBJECT_IS_NULL, diff --git a/src/inventory.h b/src/inventory.h index 0cf7395..41ed42a 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -6,8 +6,6 @@ #include "message.h" #include "obj_types.h" -#include - #define INVENTORY_NORMAL_WINDOW_PC_ROTATION_DELAY (1000U / ROTATION_COUNT) #define OFF_59E7BC_COUNT 12 diff --git a/src/item.h b/src/item.h index d02183d..8c54038 100644 --- a/src/item.h +++ b/src/item.h @@ -5,8 +5,6 @@ #include "message.h" #include "obj_types.h" -#include - #define ADDICTION_COUNT (9) typedef enum _WeaponClass { diff --git a/src/light.h b/src/light.h index 90b75b0..3f84d62 100644 --- a/src/light.h +++ b/src/light.h @@ -3,8 +3,6 @@ #include "map_defs.h" -#include - #define LIGHT_LEVEL_MIN (65536 / 4) #define LIGHT_LEVEL_MAX 65536 diff --git a/src/lips.h b/src/lips.h index f0e5d4c..1ad9bcf 100644 --- a/src/lips.h +++ b/src/lips.h @@ -4,7 +4,6 @@ #include "db.h" #include "sound.h" -#include #include #define PHONEME_COUNT (42) diff --git a/src/loadsave.h b/src/loadsave.h index 596b6bf..112742b 100644 --- a/src/loadsave.h +++ b/src/loadsave.h @@ -6,8 +6,6 @@ #include "geometry.h" #include "message.h" -#include - #define WIN32_LEAN_AND_MEAN #include diff --git a/src/main.h b/src/main.h index dd89a59..87e1078 100644 --- a/src/main.h +++ b/src/main.h @@ -4,8 +4,6 @@ #include "art.h" #include "fps_limiter.h" -#include - typedef enum MainMenuButton { MAIN_MENU_BUTTON_INTRO, MAIN_MENU_BUTTON_NEW_GAME, diff --git a/src/map.h b/src/map.h index 0f8a278..cc9ca6f 100644 --- a/src/map.h +++ b/src/map.h @@ -7,8 +7,6 @@ #include "map_defs.h" #include "message.h" -#include - #define WIN32_LEAN_AND_MEAN #include diff --git a/src/map_defs.h b/src/map_defs.h index 87a2c95..33124bd 100644 --- a/src/map_defs.h +++ b/src/map_defs.h @@ -1,8 +1,6 @@ #ifndef MAPDEFS_H #define MAPDEFS_H -#include - #define ELEVATION_COUNT (3) #define SQUARE_GRID_WIDTH (100) diff --git a/src/message.h b/src/message.h index b763508..b8fb129 100644 --- a/src/message.h +++ b/src/message.h @@ -3,8 +3,6 @@ #include "db.h" -#include - #define BADWORD_LENGTH_MAX 80 #define MESSAGE_LIST_ITEM_TEXT_FILTERED 0x01 diff --git a/src/mmx.h b/src/mmx.h index 547ef7f..4c97a29 100644 --- a/src/mmx.h +++ b/src/mmx.h @@ -1,8 +1,6 @@ #ifndef MMX_H #define MMX_H -#include - bool mmxIsSupported(); void mmxBlit(unsigned char* dest, int destPitch, unsigned char* src, int srcPitch, int width, int height); void mmxBlitTrans(unsigned char* dest, int destPitch, unsigned char* src, int srcPitch, int width, int height); diff --git a/src/movie_effect.h b/src/movie_effect.h index ab2b3ec..ac872f7 100644 --- a/src/movie_effect.h +++ b/src/movie_effect.h @@ -1,8 +1,6 @@ #ifndef MOVIE_EFFECT_H #define MOVIE_EFFECT_H -#include - typedef enum MovieEffectType { MOVIE_EFFECT_TYPE_NONE = 0, MOVIE_EFFECT_TYPE_FADE_IN = 1, diff --git a/src/movie_lib.h b/src/movie_lib.h index 06f2920..e19a650 100644 --- a/src/movie_lib.h +++ b/src/movie_lib.h @@ -8,8 +8,6 @@ #define DIRECTSOUND_VERSION 0x0300 #include -#include - typedef struct STRUCT_6B3690 { void* field_0; int field_4; diff --git a/src/options.h b/src/options.h index f0b72c9..341ba35 100644 --- a/src/options.h +++ b/src/options.h @@ -6,8 +6,6 @@ #include "message.h" #include "geometry.h" -#include - #define OPTIONS_WINDOW_BUTTONS_COUNT (10) #define PRIMARY_OPTION_VALUE_COUNT (4) #define SECONDARY_OPTION_VALUE_COUNT (2) diff --git a/src/party_member.h b/src/party_member.h index 5931a19..f87cccf 100644 --- a/src/party_member.h +++ b/src/party_member.h @@ -6,8 +6,6 @@ #include "obj_types.h" #include "scripts.h" -#include - typedef struct PartyMemberDescription { bool areaAttackMode[AREA_ATTACK_MODE_COUNT]; bool runAwayMode[RUN_AWAY_MODE_COUNT]; diff --git a/src/perk.h b/src/perk.h index 044f045..55fb641 100644 --- a/src/perk.h +++ b/src/perk.h @@ -7,8 +7,6 @@ #include "perk_defs.h" #include "stat_defs.h" -#include - typedef struct PerkDescription { char* name; char* description; diff --git a/src/pipboy.h b/src/pipboy.h index eee8de2..6be51c7 100644 --- a/src/pipboy.h +++ b/src/pipboy.h @@ -6,8 +6,6 @@ #include "geometry.h" #include "message.h" -#include - #define PIPBOY_WINDOW_WIDTH (640) #define PIPBOY_WINDOW_HEIGHT (480) diff --git a/src/proto_instance.h b/src/proto_instance.h index 1e93aa0..a7af363 100644 --- a/src/proto_instance.h +++ b/src/proto_instance.h @@ -4,8 +4,6 @@ #include "message.h" #include "obj_types.h" -#include - extern MessageListItem stru_49A990; int _obj_sid(Object* object, int* sidPtr); diff --git a/src/queue.h b/src/queue.h index 91fd1c4..22ac198 100644 --- a/src/queue.h +++ b/src/queue.h @@ -4,8 +4,6 @@ #include "db.h" #include "obj_types.h" -#include - typedef enum EventType { EVENT_TYPE_DRUG = 0, EVENT_TYPE_KNOCKOUT = 1, diff --git a/src/scripts.h b/src/scripts.h index 0901eb1..2db98bd 100644 --- a/src/scripts.h +++ b/src/scripts.h @@ -7,8 +7,6 @@ #include "message.h" #include "obj_types.h" -#include - #define SCRIPT_LIST_EXTENT_SIZE 16 #define SCRIPT_FLAG_0x01 (0x01) diff --git a/src/sfall_config.h b/src/sfall_config.h index fe0b6d7..69be7a0 100644 --- a/src/sfall_config.h +++ b/src/sfall_config.h @@ -3,8 +3,6 @@ #include "config.h" -#include - #define SFALL_CONFIG_FILE_NAME "ddraw.ini" #define SFALL_CONFIG_MISC_KEY "Misc" diff --git a/src/skill.h b/src/skill.h index 63e787e..64b1bd5 100644 --- a/src/skill.h +++ b/src/skill.h @@ -7,8 +7,6 @@ #include "proto_types.h" #include "skill_defs.h" -#include - #define SKILLS_MAX_USES_PER_DAY (3) #define REPAIRABLE_DAMAGE_FLAGS_LENGTH (5) diff --git a/src/skilldex.h b/src/skilldex.h index 0cc81a7..a3a6de7 100644 --- a/src/skilldex.h +++ b/src/skilldex.h @@ -5,8 +5,6 @@ #include "geometry.h" #include "message.h" -#include - #define SKILLDEX_SKILL_BUTTON_BUFFER_COUNT (SKILLDEX_SKILL_COUNT * 2) typedef enum SkilldexFrm { diff --git a/src/sound_decoder.h b/src/sound_decoder.h index b165c43..b81d337 100644 --- a/src/sound_decoder.h +++ b/src/sound_decoder.h @@ -1,7 +1,6 @@ #ifndef SOUND_DECODER_H #define SOUND_DECODER_H -#include #include #define SOUND_DECODER_IN_BUFFER_SIZE (512) diff --git a/src/sound_effects_cache.h b/src/sound_effects_cache.h index 399624c..6fdcabe 100644 --- a/src/sound_effects_cache.h +++ b/src/sound_effects_cache.h @@ -3,8 +3,6 @@ #include "cache.h" -#include - // The maximum number of sound effects that can be loaded and played // simultaneously. #define SOUND_EFFECTS_MAX_COUNT (4) diff --git a/src/sound_effects_list.h b/src/sound_effects_list.h index 10341f9..fbe8bda 100644 --- a/src/sound_effects_list.h +++ b/src/sound_effects_list.h @@ -1,8 +1,6 @@ #ifndef SOUND_EFFECTS_LIST_H #define SOUND_EFFECTS_LIST_H -#include - #define SFXL_OK (0) #define SFXL_ERR (1) #define SFXL_ERR_TAG_INVALID (2) diff --git a/src/stat.h b/src/stat.h index 4f91ffc..6c9876c 100644 --- a/src/stat.h +++ b/src/stat.h @@ -7,8 +7,6 @@ #include "proto_types.h" #include "stat_defs.h" -#include - #define STAT_ERR_INVALID_STAT (-5) // Provides metadata about stats. diff --git a/src/text_font.h b/src/text_font.h index 0fd00ad..bd59028 100644 --- a/src/text_font.h +++ b/src/text_font.h @@ -1,8 +1,6 @@ #ifndef TEXT_FONT_H #define TEXT_FONT_H -#include - // The maximum number of text fonts. #define TEXT_FONT_MAX (10) diff --git a/src/text_object.h b/src/text_object.h index fa7fdf2..f9f10b3 100644 --- a/src/text_object.h +++ b/src/text_object.h @@ -4,8 +4,6 @@ #include "geometry.h" #include "obj_types.h" -#include - // The maximum number of text objects that can exist at the same time. #define TEXT_OBJECTS_MAX_COUNT (20) diff --git a/src/tile.h b/src/tile.h index a4b14ce..d07d884 100644 --- a/src/tile.h +++ b/src/tile.h @@ -5,8 +5,6 @@ #include "map.h" #include "obj_types.h" -#include - #define TILE_SET_CENTER_FLAG_0x01 0x01 #define TILE_SET_CENTER_FLAG_0x02 0x02 diff --git a/src/trait.h b/src/trait.h index 4ce92a8..f2cf382 100644 --- a/src/trait.h +++ b/src/trait.h @@ -5,8 +5,6 @@ #include "message.h" #include "trait_defs.h" -#include - // Provides metadata about traits. typedef struct TraitDescription { // The name of trait. diff --git a/src/win32.h b/src/win32.h index 8f7a7b6..076d34a 100644 --- a/src/win32.h +++ b/src/win32.h @@ -9,8 +9,6 @@ #define DIRECTSOUND_VERSION 0x0300 #include -#include - typedef HRESULT(__stdcall DirectSoundCreateProc)(GUID*, LPDIRECTSOUND*, IUnknown*); extern DirectSoundCreateProc* gDirectSoundCreateProc; diff --git a/src/window.h b/src/window.h index 6d79d15..b1f9738 100644 --- a/src/window.h +++ b/src/window.h @@ -5,8 +5,6 @@ #include "interpreter.h" #include "region.h" -#include - #define MANAGED_WINDOW_COUNT (16) typedef void (*WINDOWDRAWINGPROC)(unsigned char* src, int src_pitch, int a3, int src_x, int src_y, int src_width, int src_height, int dest_x, int dest_y); diff --git a/src/window_manager.h b/src/window_manager.h index 6b3751a..e1da1ec 100644 --- a/src/window_manager.h +++ b/src/window_manager.h @@ -3,7 +3,6 @@ #include "geometry.h" -#include #include #define WIN32_LEAN_AND_MEAN diff --git a/src/window_manager_private.h b/src/window_manager_private.h index 00e6b17..c199ca7 100644 --- a/src/window_manager_private.h +++ b/src/window_manager_private.h @@ -1,8 +1,6 @@ #ifndef WINDOW_MANAGER_PRIVATE_H #define WINDOW_MANAGER_PRIVATE_H -#include - typedef struct struc_177 struc_177; typedef struct STRUCT_6B2340 { diff --git a/src/world_map.h b/src/world_map.h index 65576ba..794583c 100644 --- a/src/world_map.h +++ b/src/world_map.h @@ -8,8 +8,6 @@ #include "message.h" #include "obj_types.h" -#include - #define CITY_NAME_SIZE (40) #define TILE_WALK_MASK_NAME_SIZE (40) #define ENTRANCE_LIST_CAPACITY (10) diff --git a/src/xfile.h b/src/xfile.h index 4c19d53..50bfd35 100644 --- a/src/xfile.h +++ b/src/xfile.h @@ -3,7 +3,6 @@ #include "dfile.h" -#include #include #include