diff options
| author | athrxx | 2011-12-12 16:14:08 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:16 +0100 |
| commit | 36d85a315fe2d6927f6609ec312f8fea8b9a3c3c (patch) | |
| tree | ebedadbf7eb6d3a748ab51cc6d581173e26c4fe0 | |
| parent | 4c6302943b1122703241686a66c1f90b2ee4a209 (diff) | |
| download | scummvm-rg350-36d85a315fe2d6927f6609ec312f8fea8b9a3c3c.tar.gz scummvm-rg350-36d85a315fe2d6927f6609ec312f8fea8b9a3c3c.tar.bz2 scummvm-rg350-36d85a315fe2d6927f6609ec312f8fea8b9a3c3c.zip | |
KYRA: (EOB) - rename some files for a better match with the contained code
| -rw-r--r-- | engines/kyra/darkmoon.cpp (renamed from engines/kyra/eob2.cpp) | 2 | ||||
| -rw-r--r-- | engines/kyra/darkmoon.h (renamed from engines/kyra/eob2.h) | 0 | ||||
| -rw-r--r-- | engines/kyra/detection.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/eob.cpp (renamed from engines/kyra/eob1.cpp) | 2 | ||||
| -rw-r--r-- | engines/kyra/eob.h (renamed from engines/kyra/eob1.h) | 0 | ||||
| -rw-r--r-- | engines/kyra/module.mk | 8 | ||||
| -rw-r--r-- | engines/kyra/resource.h | 2 | ||||
| -rw-r--r-- | engines/kyra/sequences_darkmoon.cpp (renamed from engines/kyra/sequences_eob2.cpp) | 2 | ||||
| -rw-r--r-- | engines/kyra/sequences_eob.cpp (renamed from engines/kyra/sequences_eob1.cpp) | 2 | ||||
| -rw-r--r-- | engines/kyra/staticres_eob.cpp | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/engines/kyra/eob2.cpp b/engines/kyra/darkmoon.cpp index 64e394a717..e44040b0d5 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 index 35eb90a9dc..35eb90a9dc 100644 --- a/engines/kyra/eob2.h +++ b/engines/kyra/darkmoon.h diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index abb6a70f42..e021a3a4c2 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 index c87118918a..d90a3caa74 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 index 2dfccca94e..2dfccca94e 100644 --- a/engines/kyra/eob1.h +++ b/engines/kyra/eob.h diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk index 23aee52465..21e3ba3dff 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 413bc4572f..072b4187c1 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 index 433ee4ae1f..6b342adb50 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 index b25de5ccd2..e8526f2ba0 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 faa2591163..2594828fdf 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" |