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

@@ -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"
 

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"

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 {
 

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"

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"

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"

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"

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"

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 \

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"