diff options
author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
tree | 9173f9964c0fec4215514e622f705810730d0ce9 /engines/tinsel/dw.h | |
parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/tinsel/dw.h')
-rw-r--r-- | engines/tinsel/dw.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/tinsel/dw.h b/engines/tinsel/dw.h index 8bd7ca1a4e..aed4c50408 100644 --- a/engines/tinsel/dw.h +++ b/engines/tinsel/dw.h @@ -42,8 +42,6 @@ typedef int HPOLYGON; #define LF_CHAR '\x0a' // line feed // file names -#define SAMPLE_FILE "english.smp" // all samples -#define SAMPLE_INDEX "english.idx" // sample index filename #define MIDI_FILE "midi.dat" // all MIDI sequences #define INDEX_FILENAME "index" // name of index file #define PSX_INDEX_FILENAME "index.dat" // name of index file in psx version |