From eba1653904bd0209f00fa02ea455f7d78c533905 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 15 Feb 2006 18:48:49 +0000 Subject: [PATCH] o Renamed script_v6he.cpp and script_v7he.cpp to script_v60he.cpp and script_v70he.cpp respectively since we use 2 digits for HE versioning. o Also renamed resource_v7he.* to resource_he.* because it is actually not HE70-specific but is used by all HE70+ titles. svn-id: r20703 --- engines/scumm/cursor.cpp | 2 +- engines/scumm/he/{resource_v7he.cpp => resource_he.cpp} | 2 +- engines/scumm/he/{resource_v7he.h => resource_he.h} | 4 ++-- engines/scumm/he/script_v100he.cpp | 2 +- engines/scumm/he/{script_v6he.cpp => script_v60he.cpp} | 0 engines/scumm/he/{script_v7he.cpp => script_v70he.cpp} | 2 +- engines/scumm/he/script_v72he.cpp | 2 +- engines/scumm/he/script_v80he.cpp | 2 +- engines/scumm/he/script_v90he.cpp | 2 +- engines/scumm/module.mk | 6 +++--- engines/scumm/scumm.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename engines/scumm/he/{resource_v7he.cpp => resource_he.cpp} (99%) rename engines/scumm/he/{resource_v7he.h => resource_he.h} (99%) rename engines/scumm/he/{script_v6he.cpp => script_v60he.cpp} (100%) rename engines/scumm/he/{script_v7he.cpp => script_v70he.cpp} (99%) diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 0be6a48c53b..99fc3cf4c01 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -28,7 +28,7 @@ #include "scumm/intern.h" #include "scumm/he/intern_he.h" #include "scumm/object.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/saveload.h" #include "scumm/scumm.h" diff --git a/engines/scumm/he/resource_v7he.cpp b/engines/scumm/he/resource_he.cpp similarity index 99% rename from engines/scumm/he/resource_v7he.cpp rename to engines/scumm/he/resource_he.cpp index 95c3c23f2ba..f7be975ca3e 100644 --- a/engines/scumm/he/resource_v7he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -28,7 +28,7 @@ #include "scumm/scumm.h" #include "scumm/he/intern_he.h" #include "scumm/resource.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/sound.h" #include "scumm/util.h" #include "sound/wave.h" diff --git a/engines/scumm/he/resource_v7he.h b/engines/scumm/he/resource_he.h similarity index 99% rename from engines/scumm/he/resource_v7he.h rename to engines/scumm/he/resource_he.h index 1496aa3d7f9..20ad0a11103 100644 --- a/engines/scumm/he/resource_v7he.h +++ b/engines/scumm/he/resource_he.h @@ -24,8 +24,8 @@ * */ -#if !defined(RESOURCE_V7HE_H) && !defined(DISABLE_HE) -#define RESOURCE_V7HE_H +#if !defined(RESOURCE_HE_H) && !defined(DISABLE_HE) +#define RESOURCE_HE_H namespace Scumm { diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index c9bfeade678..414cbd62d33 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -30,7 +30,7 @@ #include "scumm/he/intern_he.h" #include "scumm/object.h" #include "scumm/resource.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/he/sprite_he.h" diff --git a/engines/scumm/he/script_v6he.cpp b/engines/scumm/he/script_v60he.cpp similarity index 100% rename from engines/scumm/he/script_v6he.cpp rename to engines/scumm/he/script_v60he.cpp diff --git a/engines/scumm/he/script_v7he.cpp b/engines/scumm/he/script_v70he.cpp similarity index 99% rename from engines/scumm/he/script_v7he.cpp rename to engines/scumm/he/script_v70he.cpp index 400e7c0ad03..e955f1267b6 100644 --- a/engines/scumm/he/script_v7he.cpp +++ b/engines/scumm/he/script_v70he.cpp @@ -31,7 +31,7 @@ #include "scumm/he/intern_he.h" #include "scumm/object.h" #include "scumm/resource.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/verbs.h" diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index b94cc06b405..a97ae843f17 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -32,7 +32,7 @@ #include "scumm/he/intern_he.h" #include "scumm/object.h" #include "scumm/resource.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/util.h" diff --git a/engines/scumm/he/script_v80he.cpp b/engines/scumm/he/script_v80he.cpp index f82aebe0509..f65fdc933f0 100644 --- a/engines/scumm/he/script_v80he.cpp +++ b/engines/scumm/he/script_v80he.cpp @@ -32,7 +32,7 @@ #include "scumm/he/intern_he.h" #include "scumm/object.h" #include "scumm/resource.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/util.h" diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index 899bce80366..a4fbd65053a 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -29,7 +29,7 @@ #include "scumm/he/logic_he.h" #include "scumm/object.h" #include "scumm/resource.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/he/sprite_he.h" diff --git a/engines/scumm/module.mk b/engines/scumm/module.mk index 0e907363290..97b4323af64 100644 --- a/engines/scumm/module.mk +++ b/engines/scumm/module.mk @@ -39,7 +39,7 @@ MODULE_OBJS := \ script_v2.o \ script_v5.o \ script_v6.o \ - he/script_v6he.o \ + he/script_v60he.o \ scumm.o \ sound.o \ he/sound_he.o \ @@ -83,8 +83,8 @@ MODULE_OBJS += \ he/floodfill_he.o \ he/logic_he.o \ he/palette_he.o \ - he/resource_v7he.o \ - he/script_v7he.o \ + he/resource_he.o \ + he/script_v70he.o \ he/script_v72he.o \ he/script_v80he.o \ he/script_v90he.o \ diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 3f9d1ea8774..7781a11df2b 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -51,7 +51,7 @@ #include "scumm/player_v2.h" #include "scumm/player_v2a.h" #include "scumm/player_v3a.h" -#include "scumm/he/resource_v7he.h" +#include "scumm/he/resource_he.h" #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/he/sprite_he.h"