diff --git a/engines/kyra/eob2.cpp b/engines/kyra/darkmoon.cpp similarity index 99% rename from engines/kyra/eob2.cpp rename to engines/kyra/darkmoon.cpp index 64e394a717f..e44040b0d52 100644 --- a/engines/kyra/eob2.cpp +++ b/engines/kyra/darkmoon.cpp @@ -22,7 +22,7 @@ #ifdef ENABLE_EOB -#include "kyra/eob2.h" +#include "kyra/darkmoon.h" #include "kyra/resource.h" #include "kyra/sound.h" diff --git a/engines/kyra/eob2.h b/engines/kyra/darkmoon.h similarity index 100% rename from engines/kyra/eob2.h rename to engines/kyra/darkmoon.h diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index abb6a70f429..e021a3a4c20 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -24,8 +24,8 @@ #include "kyra/lol.h" #include "kyra/kyra_hof.h" #include "kyra/kyra_mr.h" -#include "kyra/eob1.h" -#include "kyra/eob2.h" +#include "kyra/eob.h" +#include "kyra/darkmoon.h" #include "common/config-manager.h" #include "common/system.h" diff --git a/engines/kyra/eob1.cpp b/engines/kyra/eob.cpp similarity index 99% rename from engines/kyra/eob1.cpp rename to engines/kyra/eob.cpp index c87118918ab..d90a3caa749 100644 --- a/engines/kyra/eob1.cpp +++ b/engines/kyra/eob.cpp @@ -22,7 +22,7 @@ #ifdef ENABLE_EOB -#include "kyra/eob1.h" +#include "kyra/eob.h" #include "kyra/resource.h" #include "kyra/sound.h" diff --git a/engines/kyra/eob1.h b/engines/kyra/eob.h similarity index 100% rename from engines/kyra/eob1.h rename to engines/kyra/eob.h diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk index 23aee52465c..21e3ba3dff6 100644 --- a/engines/kyra/module.mk +++ b/engines/kyra/module.mk @@ -109,8 +109,8 @@ endif MODULE_OBJS += \ chargen.o \ eobcommon.o \ - eob1.o \ - eob2.o \ + eob.o \ + darkmoon.o \ gui_eob.o \ items_eob.o \ magic_eob.o \ @@ -118,8 +118,8 @@ MODULE_OBJS += \ scene_eob.o \ screen_eob.o \ script_eob.o \ - sequences_eob1.o \ - sequences_eob2.o \ + sequences_eob.o \ + sequences_darkmoon.o \ sprites_eob.o \ staticres_eob.o \ timer_eob.o diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 413bc4572f8..072b4187c1d 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -35,7 +35,7 @@ #include "common/archive.h" #include "kyra/kyra_v1.h" -#include "kyra/eob2.h" +#include "kyra/darkmoon.h" #include "kyra/lol.h" #include "kyra/kyra_hof.h" diff --git a/engines/kyra/sequences_eob2.cpp b/engines/kyra/sequences_darkmoon.cpp similarity index 99% rename from engines/kyra/sequences_eob2.cpp rename to engines/kyra/sequences_darkmoon.cpp index 433ee4ae1fb..6b342adb504 100644 --- a/engines/kyra/sequences_eob2.cpp +++ b/engines/kyra/sequences_darkmoon.cpp @@ -22,7 +22,7 @@ #ifdef ENABLE_EOB -#include "kyra/eob2.h" +#include "kyra/darkmoon.h" #include "kyra/screen_eob.h" #include "kyra/resource.h" #include "kyra/sound.h" diff --git a/engines/kyra/sequences_eob1.cpp b/engines/kyra/sequences_eob.cpp similarity index 99% rename from engines/kyra/sequences_eob1.cpp rename to engines/kyra/sequences_eob.cpp index b25de5ccd21..e8526f2ba0d 100644 --- a/engines/kyra/sequences_eob1.cpp +++ b/engines/kyra/sequences_eob.cpp @@ -22,7 +22,7 @@ #ifdef ENABLE_EOB -#include "kyra/eob1.h" +#include "kyra/eob.h" #include "kyra/screen_eob.h" #include "kyra/resource.h" #include "kyra/sound.h" diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp index faa25911636..2594828fdf4 100644 --- a/engines/kyra/staticres_eob.cpp +++ b/engines/kyra/staticres_eob.cpp @@ -21,7 +21,7 @@ * */ -#include "kyra/eob1.h" +#include "kyra/eob.h" #include "kyra/resource.h"