Rename core

CMakeLists.txt

@@ -52,8 +52,6 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/combat.h"
     "src/config.cc"
     "src/config.h"
-    "src/core.cc"
-    "src/core.h"
     "src/credits.cc"
     "src/credits.h"
     "src/critter.cc"
@@ -220,6 +218,8 @@ target_sources(${EXECUTABLE_NAME} PUBLIC
     "src/stat.h"
     "src/string_parsers.cc"
     "src/string_parsers.h"
+    "src/svga.cc"
+    "src/svga.h"
     "src/text_font.cc"
     "src/text_font.h"
     "src/text_object.cc"

src/animation.cc

@@ -7,7 +7,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "debug.h"
 #include "display_monitor.h"
@@ -30,6 +29,7 @@
 #include "random.h"
 #include "scripts.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_object.h"
 #include "tile.h"
 #include "trait.h"

src/automap.cc

@@ -8,7 +8,6 @@
 #include "art.h"
 #include "color.h"
 #include "config.h"
-#include "core.h"
 #include "dbox.h"
 #include "debug.h"
 #include "draw.h"
@@ -24,6 +23,7 @@
 #include "memory.h"
 #include "object.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 

src/character_editor.cc

@@ -10,7 +10,6 @@
 #include "art.h"
 #include "color.h"
 #include "combat.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "db.h"
@@ -39,6 +38,7 @@
 #include "sfall_config.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "trait.h"
 #include "window_manager.h"

src/character_selector.cc

@@ -9,7 +9,6 @@
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
-#include "core.h"
 #include "critter.h"
 #include "db.h"
 #include "debug.h"
@@ -30,6 +29,7 @@
 #include "sfall_config.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "trait.h"
 #include "window_manager.h"

src/color.cc

@@ -5,7 +5,7 @@
 
 #include <algorithm>
 
-#include "core.h"
+#include "svga.h"
 
 namespace fallout {
 

src/combat.cc

@@ -9,7 +9,6 @@
 #include "art.h"
 #include "color.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "db.h"
 #include "debug.h"
@@ -40,6 +39,7 @@
 #include "sfall_config.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "trait.h"

src/combat_ai.cc

@@ -9,7 +9,6 @@
 #include "art.h"
 #include "combat.h"
 #include "config.h"
-#include "core.h"
 #include "critter.h"
 #include "debug.h"
 #include "display_monitor.h"
@@ -32,6 +31,7 @@
 #include "scripts.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_object.h"
 #include "tile.h"
 

src/credits.cc

@@ -4,7 +4,6 @@
 
 #include "art.h"
 #include "color.h"
-#include "core.h"
 #include "cycle.h"
 #include "db.h"
 #include "debug.h"
@@ -17,6 +16,7 @@
 #include "palette.h"
 #include "platform_compat.h"
 #include "sound.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 

src/cycle.cc

@@ -1,10 +1,10 @@
 #include "cycle.h"
 
 #include "color.h"
-#include "core.h"
 #include "game_config.h"
 #include "input.h"
 #include "palette.h"
+#include "svga.h"
 
 namespace fallout {
 

src/dbox.cc

@@ -8,7 +8,6 @@
 #include "art.h"
 #include "character_editor.h"
 #include "color.h"
-#include "core.h"
 #include "debug.h"
 #include "draw.h"
 #include "game.h"
@@ -18,6 +17,7 @@
 #include "message.h"
 #include "mouse.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 #include "word_wrap.h"

src/dialog.cc

@@ -2,11 +2,11 @@
 
 #include <string.h>
 
-#include "core.h"
 #include "memory_manager.h"
 #include "mouse.h"
 #include "movie.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 

src/display_monitor.cc

@@ -7,7 +7,6 @@
 #include "art.h"
 #include "color.h"
 #include "combat.h"
-#include "core.h"
 #include "draw.h"
 #include "game_mouse.h"
 #include "game_sound.h"
@@ -16,6 +15,7 @@
 #include "interface.h"
 #include "memory.h"
 #include "sfall_config.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 

src/draw.cc

@@ -3,8 +3,8 @@
 #include <string.h>
 
 #include "color.h"
-#include "core.h"
 #include "mmx.h"
+#include "svga.h"
 
 namespace fallout {
 

src/elevator.cc

@@ -6,7 +6,6 @@
 #include <algorithm>
 
 #include "art.h"
-#include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "draw.h"
@@ -20,6 +19,7 @@
 #include "pipboy.h"
 #include "scripts.h"
 #include "sfall_config.h"
+#include "svga.h"
 #include "window_manager.h"
 
 namespace fallout {

src/endgame.cc

@@ -8,7 +8,6 @@
 
 #include "art.h"
 #include "color.h"
-#include "core.h"
 #include "credits.h"
 #include "cycle.h"
 #include "db.h"
@@ -30,6 +29,7 @@
 #include "platform_compat.h"
 #include "random.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 #include "word_wrap.h"

src/game.cc

@@ -18,7 +18,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "db.h"
@@ -61,6 +60,7 @@
 #include "skill.h"
 #include "skilldex.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "trait.h"

src/game_dialog.cc

@@ -10,7 +10,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "debug.h"
@@ -36,6 +35,7 @@
 #include "sfall_config.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "text_object.h"
 #include "tile.h"

src/game_mouse.cc

@@ -9,7 +9,6 @@
 #include "art.h"
 #include "color.h"
 #include "combat.h"
-#include "core.h"
 #include "critter.h"
 #include "draw.h"
 #include "game.h"
@@ -26,6 +25,7 @@
 #include "sfall_config.h"
 #include "skill.h"
 #include "skilldex.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "window_manager.h"

src/game_movie.cc

@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "color.h"
-#include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "game.h"
@@ -17,6 +16,7 @@
 #include "movie_effect.h"
 #include "palette.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 

src/game_sound.cc

@@ -7,7 +7,6 @@
 #include "art.h"
 #include "audio.h"
 #include "combat.h"
-#include "core.h"
 #include "debug.h"
 #include "game_config.h"
 #include "input.h"
@@ -22,6 +21,7 @@
 #include "random.h"
 #include "sound_effects_cache.h"
 #include "stat.h"
+#include "svga.h"
 #include "window_manager.h"
 #include "worldmap.h"
 

src/input.cc

@@ -4,12 +4,12 @@
 
 #include "audio_engine.h"
 #include "color.h"
-#include "core.h"
 #include "dinput.h"
 #include "draw.h"
 #include "kb.h"
 #include "memory.h"
 #include "mouse.h"
+#include "svga.h"
 #include "text_font.h"
 #include "vcr.h"
 #include "win32.h"

src/interface.cc

@@ -8,7 +8,6 @@
 #include "color.h"
 #include "combat.h"
 #include "config.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "debug.h"
@@ -32,6 +31,7 @@
 #include "proto_types.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "window_manager.h"

src/interpreter.cc

@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core.h"
 #include "db.h"
 #include "debug.h"
 #include "export.h"
@@ -15,6 +14,7 @@
 #include "interpreter_lib.h"
 #include "memory_manager.h"
 #include "platform_compat.h"
+#include "svga.h"
 
 namespace fallout {
 

src/interpreter_extra.cc

@@ -10,7 +10,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "debug.h"
 #include "dialog.h"
@@ -39,6 +38,7 @@
 #include "scripts.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_object.h"
 #include "tile.h"
 #include "trait.h"

src/interpreter_lib.cc

@@ -1,18 +1,18 @@
 #include "interpreter_lib.h"
 
 #include "color.h"
-#include "core.h"
 #include "datafile.h"
 #include "debug.h"
 #include "dialog.h"
 #include "input.h"
 #include "interpreter_extra.h"
 #include "memory_manager.h"
-#include "mouse_manager.h"
 #include "mouse.h"
+#include "mouse_manager.h"
 #include "nevs.h"
 #include "select_file_list.h"
 #include "sound.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window.h"
 #include "window_manager_private.h"

src/inventory.cc

@@ -12,7 +12,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "dbox.h"
 #include "debug.h"
@@ -42,6 +41,7 @@
 #include "scripts.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "window_manager.h"

src/kb.cc

@@ -2,8 +2,8 @@
 
 #include <string.h>
 
-#include "core.h"
 #include "input.h"
+#include "svga.h"
 #include "vcr.h"
 
 namespace fallout {

src/lips.cc

@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "audio.h"
-#include "core.h"
 #include "db.h"
 #include "debug.h"
 #include "game_sound.h"
@@ -12,6 +11,7 @@
 #include "memory.h"
 #include "platform_compat.h"
 #include "sound.h"
+#include "svga.h"
 
 namespace fallout {
 

src/loadsave.cc

@@ -13,7 +13,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "db.h"
@@ -48,6 +47,7 @@
 #include "scripts.h"
 #include "skill.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "trait.h"

src/main.cc

@@ -8,7 +8,6 @@
 #include "autorun.h"
 #include "character_selector.h"
 #include "color.h"
-#include "core.h"
 #include "credits.h"
 #include "cycle.h"
 #include "db.h"
@@ -35,6 +34,7 @@
 #include "scripts.h"
 #include "selfrun.h"
 #include "sfall_config.h"
+#include "svga.h"
 #include "text_font.h"
 #include "version.h"
 #include "window.h"

src/map.cc

@@ -11,7 +11,6 @@
 #include "character_editor.h"
 #include "color.h"
 #include "combat.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "debug.h"
@@ -37,6 +36,7 @@
 #include "queue.h"
 #include "random.h"
 #include "scripts.h"
+#include "svga.h"
 #include "text_object.h"
 #include "tile.h"
 #include "window_manager.h"

src/mmx.cc

@@ -2,7 +2,7 @@
 
 #include <string.h>
 
-#include "core.h"
+#include "svga.h"
 
 namespace fallout {
 

src/mouse.cc

@@ -1,11 +1,11 @@
 #include "mouse.h"
 
 #include "color.h"
-#include "core.h"
 #include "dinput.h"
 #include "input.h"
-#include "memory.h"
 #include "kb.h"
+#include "memory.h"
+#include "svga.h"
 #include "vcr.h"
 
 namespace fallout {

src/mouse_manager.cc

@@ -2,7 +2,6 @@
 
 #include <string.h>
 
-#include "core.h"
 #include "datafile.h"
 #include "db.h"
 #include "debug.h"
@@ -10,6 +9,7 @@
 #include "memory_manager.h"
 #include "mouse.h"
 #include "platform_compat.h"
+#include "svga.h"
 
 namespace fallout {
 

src/movie.cc

@@ -5,7 +5,6 @@
 #include <SDL.h>
 
 #include "color.h"
-#include "core.h"
 #include "db.h"
 #include "debug.h"
 #include "draw.h"
@@ -18,6 +17,7 @@
 #include "platform_compat.h"
 #include "pointer_registry.h"
 #include "sound.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window.h"
 #include "window_manager.h"

src/object.cc

@@ -7,7 +7,6 @@
 #include "art.h"
 #include "color.h"
 #include "combat.h"
-#include "core.h"
 #include "critter.h"
 #include "debug.h"
 #include "draw.h"
@@ -22,6 +21,7 @@
 #include "proto.h"
 #include "proto_instance.h"
 #include "scripts.h"
+#include "svga.h"
 #include "text_object.h"
 #include "tile.h"
 #include "worldmap.h"

src/options.cc

@@ -10,7 +10,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "draw.h"
@@ -28,6 +27,7 @@
 #include "mouse.h"
 #include "platform_compat.h"
 #include "scripts.h"
+#include "svga.h"
 #include "text_font.h"
 #include "text_object.h"
 #include "tile.h"

src/palette.cc

@@ -3,11 +3,11 @@
 #include <string.h>
 
 #include "color.h"
-#include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "game_sound.h"
 #include "input.h"
+#include "svga.h"
 
 namespace fallout {
 

src/pipboy.cc

@@ -9,7 +9,6 @@
 #include "color.h"
 #include "combat.h"
 #include "config.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "dbox.h"
@@ -35,6 +34,7 @@
 #include "random.h"
 #include "scripts.h"
 #include "stat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 #include "word_wrap.h"

src/scripts.cc

@@ -10,7 +10,6 @@
 #include "art.h"
 #include "automap.h"
 #include "combat.h"
-#include "core.h"
 #include "critter.h"
 #include "debug.h"
 #include "dialog.h"
@@ -31,6 +30,7 @@
 #include "proto_instance.h"
 #include "queue.h"
 #include "stat.h"
+#include "svga.h"
 #include "tile.h"
 #include "window_manager.h"
 #include "window_manager_private.h"

src/selfrun.cc

@@ -2,7 +2,6 @@
 
 #include <stdlib.h>
 
-#include "core.h"
 #include "db.h"
 #include "game.h"
 #include "game_config.h"
@@ -10,6 +9,7 @@
 #include "kb.h"
 #include "mouse.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "vcr.h"
 
 namespace fallout {

src/skilldex.cc

@@ -5,7 +5,6 @@
 
 #include "art.h"
 #include "color.h"
-#include "core.h"
 #include "cycle.h"
 #include "debug.h"
 #include "draw.h"
@@ -22,6 +21,7 @@
 #include "object.h"
 #include "platform_compat.h"
 #include "skill.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 

src/stat.cc

@@ -6,7 +6,6 @@
 
 #include "art.h"
 #include "combat.h"
-#include "core.h"
 #include "critter.h"
 #include "display_monitor.h"
 #include "game.h"
@@ -23,6 +22,7 @@
 #include "random.h"
 #include "scripts.h"
 #include "skill.h"
+#include "svga.h"
 #include "tile.h"
 #include "trait.h"
 

src/svga.cc

@@ -1,4 +1,4 @@
-#include "core.h"
+#include "svga.h"
 
 #include <limits.h>
 #include <string.h>

src/svga.h

@@ -1,5 +1,5 @@
-#ifndef CORE_H
+#ifndef FALLOUT_SVGA_H_
-#define CORE_H
+#define FALLOUT_SVGA_H_
 
 #include <SDL.h>
 
@@ -65,4 +65,4 @@ void handleWindowSizeChanged();
 
 } // namespace fallout
 
-#endif /* CORE_H */
+#endif /* FALLOUT_SVGA_H_ */

src/text_object.cc

@@ -2,13 +2,13 @@
 
 #include <string.h>
 
-#include "core.h"
 #include "debug.h"
 #include "draw.h"
 #include "game_config.h"
 #include "input.h"
 #include "memory.h"
 #include "object.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "word_wrap.h"

src/tile.cc

@@ -7,7 +7,6 @@
 #include "art.h"
 #include "color.h"
 #include "config.h"
-#include "core.h"
 #include "debug.h"
 #include "draw.h"
 #include "game_config.h"
@@ -16,6 +15,7 @@
 #include "map.h"
 #include "object.h"
 #include "platform_compat.h"
+#include "svga.h"
 
 namespace fallout {
 

src/vcr.cc

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

src/win32.cc

@@ -4,8 +4,8 @@
 
 #include <SDL.h>
 
-#include "core.h"
 #include "main.h"
+#include "svga.h"
 #include "window_manager.h"
 
 namespace fallout {

src/window.cc

@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include "color.h"
-#include "core.h"
 #include "datafile.h"
 #include "draw.h"
 #include "game.h"
@@ -13,10 +12,11 @@
 #include "interpreter_lib.h"
 #include "kb.h"
 #include "memory_manager.h"
-#include "mouse_manager.h"
 #include "mouse.h"
+#include "mouse_manager.h"
 #include "movie.h"
 #include "platform_compat.h"
+#include "svga.h"
 #include "text_font.h"
 #include "widget.h"
 #include "window_manager.h"

src/window_manager.cc

@@ -7,7 +7,6 @@
 #include <SDL.h>
 
 #include "color.h"
-#include "core.h"
 #include "debug.h"
 #include "dinput.h"
 #include "draw.h"
@@ -16,6 +15,7 @@
 #include "mouse.h"
 #include "palette.h"
 #include "pointer_registry.h"
+#include "svga.h"
 #include "text_font.h"
 #include "vcr.h"
 #include "win32.h"

src/window_manager_private.cc

@@ -6,12 +6,12 @@
 #include <algorithm>
 
 #include "color.h"
-#include "core.h"
 #include "draw.h"
 #include "input.h"
 #include "kb.h"
 #include "memory.h"
 #include "mouse.h"
+#include "svga.h"
 #include "text_font.h"
 #include "window_manager.h"
 

src/worldmap.cc

@@ -12,7 +12,6 @@
 #include "color.h"
 #include "combat.h"
 #include "combat_ai.h"
-#include "core.h"
 #include "critter.h"
 #include "cycle.h"
 #include "db.h"
@@ -42,6 +41,7 @@
 #include "skill.h"
 #include "stat.h"
 #include "string_parsers.h"
+#include "svga.h"
 #include "text_font.h"
 #include "tile.h"
 #include "window_manager.h"