diff --git a/CMakeLists.txt b/CMakeLists.txt index ce2e8556e..5c3cf2073 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,7 +348,7 @@ set(libdevilutionx_SRCS Source/items.cpp Source/lighting.cpp Source/loadsave.cpp - Source/mainmenu.cpp + Source/menu.cpp Source/minitext.cpp Source/misdat.cpp Source/missiles.cpp diff --git a/Source/DiabloUI/selgame.cpp b/Source/DiabloUI/selgame.cpp index 8ef309ecc..994aa1ccb 100644 --- a/Source/DiabloUI/selgame.cpp +++ b/Source/DiabloUI/selgame.cpp @@ -9,7 +9,7 @@ #include "DiabloUI/text.h" #include "config.h" #include "control.h" -#include "mainmenu.h" +#include "menu.h" #include "options.h" #include "storm/storm.h" #include "utils/language.h" diff --git a/Source/diablo.cpp b/Source/diablo.cpp index 408ac8424..7aee5e974 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -38,7 +38,7 @@ #include "init.h" #include "lighting.h" #include "loadsave.h" -#include "mainmenu.h" +#include "menu.h" #include "minitext.h" #include "missiles.h" #include "movie.h" diff --git a/Source/mainmenu.cpp b/Source/menu.cpp similarity index 100% rename from Source/mainmenu.cpp rename to Source/menu.cpp diff --git a/Source/mainmenu.h b/Source/menu.h similarity index 87% rename from Source/mainmenu.h rename to Source/menu.h index 1a657b98d..617ae3f9b 100644 --- a/Source/mainmenu.h +++ b/Source/menu.h @@ -1,5 +1,5 @@ /** - * @file mainmenu.h + * @file menu.h * * Interface of functions for interacting with the main menu. */ diff --git a/Source/multi.cpp b/Source/multi.cpp index a14b988a3..4241e9494 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -14,7 +14,7 @@ #include "dthread.h" #include "engine/point.hpp" #include "engine/random.hpp" -#include "mainmenu.h" +#include "menu.h" #include "nthread.h" #include "options.h" #include "pfile.h" diff --git a/Source/pfile.cpp b/Source/pfile.cpp index cba8550b9..2246365f0 100644 --- a/Source/pfile.cpp +++ b/Source/pfile.cpp @@ -11,7 +11,7 @@ #include "engine.h" #include "init.h" #include "loadsave.h" -#include "mainmenu.h" +#include "menu.h" #include "mpqapi.h" #include "pack.h" #include "storm/storm.h" diff --git a/Source/storm/storm_net.cpp b/Source/storm/storm_net.cpp index 02ff146b6..285e238e4 100644 --- a/Source/storm/storm_net.cpp +++ b/Source/storm/storm_net.cpp @@ -7,7 +7,7 @@ #endif #include "dvlnet/abstract_net.h" -#include "mainmenu.h" +#include "menu.h" #include "options.h" #include "storm/storm_dvlnet.h" #include "utils/stubs.h"