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
This commit is contained in:
parent
3f1a4fd6d2
commit
eba1653904
11 changed files with 13 additions and 13 deletions
|
@ -28,7 +28,7 @@
|
||||||
#include "scumm/intern.h"
|
#include "scumm/intern.h"
|
||||||
#include "scumm/he/intern_he.h"
|
#include "scumm/he/intern_he.h"
|
||||||
#include "scumm/object.h"
|
#include "scumm/object.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/saveload.h"
|
#include "scumm/saveload.h"
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
#include "scumm/he/intern_he.h"
|
#include "scumm/he/intern_he.h"
|
||||||
#include "scumm/resource.h"
|
#include "scumm/resource.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/sound.h"
|
#include "scumm/sound.h"
|
||||||
#include "scumm/util.h"
|
#include "scumm/util.h"
|
||||||
#include "sound/wave.h"
|
#include "sound/wave.h"
|
|
@ -24,8 +24,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined(RESOURCE_V7HE_H) && !defined(DISABLE_HE)
|
#if !defined(RESOURCE_HE_H) && !defined(DISABLE_HE)
|
||||||
#define RESOURCE_V7HE_H
|
#define RESOURCE_HE_H
|
||||||
|
|
||||||
namespace Scumm {
|
namespace Scumm {
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#include "scumm/he/intern_he.h"
|
#include "scumm/he/intern_he.h"
|
||||||
#include "scumm/object.h"
|
#include "scumm/object.h"
|
||||||
#include "scumm/resource.h"
|
#include "scumm/resource.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
#include "scumm/sound.h"
|
#include "scumm/sound.h"
|
||||||
#include "scumm/he/sprite_he.h"
|
#include "scumm/he/sprite_he.h"
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "scumm/he/intern_he.h"
|
#include "scumm/he/intern_he.h"
|
||||||
#include "scumm/object.h"
|
#include "scumm/object.h"
|
||||||
#include "scumm/resource.h"
|
#include "scumm/resource.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
#include "scumm/sound.h"
|
#include "scumm/sound.h"
|
||||||
#include "scumm/verbs.h"
|
#include "scumm/verbs.h"
|
|
@ -32,7 +32,7 @@
|
||||||
#include "scumm/he/intern_he.h"
|
#include "scumm/he/intern_he.h"
|
||||||
#include "scumm/object.h"
|
#include "scumm/object.h"
|
||||||
#include "scumm/resource.h"
|
#include "scumm/resource.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
#include "scumm/sound.h"
|
#include "scumm/sound.h"
|
||||||
#include "scumm/util.h"
|
#include "scumm/util.h"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include "scumm/he/intern_he.h"
|
#include "scumm/he/intern_he.h"
|
||||||
#include "scumm/object.h"
|
#include "scumm/object.h"
|
||||||
#include "scumm/resource.h"
|
#include "scumm/resource.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
#include "scumm/sound.h"
|
#include "scumm/sound.h"
|
||||||
#include "scumm/util.h"
|
#include "scumm/util.h"
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include "scumm/he/logic_he.h"
|
#include "scumm/he/logic_he.h"
|
||||||
#include "scumm/object.h"
|
#include "scumm/object.h"
|
||||||
#include "scumm/resource.h"
|
#include "scumm/resource.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
#include "scumm/sound.h"
|
#include "scumm/sound.h"
|
||||||
#include "scumm/he/sprite_he.h"
|
#include "scumm/he/sprite_he.h"
|
||||||
|
|
|
@ -39,7 +39,7 @@ MODULE_OBJS := \
|
||||||
script_v2.o \
|
script_v2.o \
|
||||||
script_v5.o \
|
script_v5.o \
|
||||||
script_v6.o \
|
script_v6.o \
|
||||||
he/script_v6he.o \
|
he/script_v60he.o \
|
||||||
scumm.o \
|
scumm.o \
|
||||||
sound.o \
|
sound.o \
|
||||||
he/sound_he.o \
|
he/sound_he.o \
|
||||||
|
@ -83,8 +83,8 @@ MODULE_OBJS += \
|
||||||
he/floodfill_he.o \
|
he/floodfill_he.o \
|
||||||
he/logic_he.o \
|
he/logic_he.o \
|
||||||
he/palette_he.o \
|
he/palette_he.o \
|
||||||
he/resource_v7he.o \
|
he/resource_he.o \
|
||||||
he/script_v7he.o \
|
he/script_v70he.o \
|
||||||
he/script_v72he.o \
|
he/script_v72he.o \
|
||||||
he/script_v80he.o \
|
he/script_v80he.o \
|
||||||
he/script_v90he.o \
|
he/script_v90he.o \
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
#include "scumm/player_v2.h"
|
#include "scumm/player_v2.h"
|
||||||
#include "scumm/player_v2a.h"
|
#include "scumm/player_v2a.h"
|
||||||
#include "scumm/player_v3a.h"
|
#include "scumm/player_v3a.h"
|
||||||
#include "scumm/he/resource_v7he.h"
|
#include "scumm/he/resource_he.h"
|
||||||
#include "scumm/scumm.h"
|
#include "scumm/scumm.h"
|
||||||
#include "scumm/sound.h"
|
#include "scumm/sound.h"
|
||||||
#include "scumm/he/sprite_he.h"
|
#include "scumm/he/sprite_he.h"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue