aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2018-05-04 10:04:18 +0200
committerEugene Sandulenko2018-05-05 23:17:34 +0200
commit132f77fd1629158e27c2487ef94cc9b6cb1c0150 (patch)
treeb5d387eb1a81c2f1a63f28f24c45f77923251f02
parent919013d7f2f130d528d32c2879b19761292e1197 (diff)
downloadscummvm-rg350-132f77fd1629158e27c2487ef94cc9b6cb1c0150.tar.gz
scummvm-rg350-132f77fd1629158e27c2487ef94cc9b6cb1c0150.tar.bz2
scummvm-rg350-132f77fd1629158e27c2487ef94cc9b6cb1c0150.zip
PRINCE: Rename sound.cpp to music.cpp
-rw-r--r--engines/prince/module.mk2
-rw-r--r--engines/prince/music.cpp (renamed from engines/prince/sound.cpp)2
-rw-r--r--engines/prince/music.h (renamed from engines/prince/sound.h)4
-rw-r--r--engines/prince/prince.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/prince/module.mk b/engines/prince/module.mk
index 27bbc21700..6e9e80debd 100644
--- a/engines/prince/module.mk
+++ b/engines/prince/module.mk
@@ -12,13 +12,13 @@ MODULE_OBJS = \
graphics.o \
hero.o \
mhwanh.o \
+ music.o \
mob.o \
object.o \
prince.o \
pscr.o \
saveload.o \
script.o \
- sound.o \
variatxt.o \
videoplayer.o
diff --git a/engines/prince/sound.cpp b/engines/prince/music.cpp
index 206b131cd2..6d208e292a 100644
--- a/engines/prince/sound.cpp
+++ b/engines/prince/music.cpp
@@ -20,7 +20,7 @@
*
*/
-#include "prince/sound.h"
+#include "prince/music.h"
#include "prince/musNum.h"
#include "common/archive.h"
diff --git a/engines/prince/sound.h b/engines/prince/music.h
index 21f9e48b37..061e10c8b8 100644
--- a/engines/prince/sound.h
+++ b/engines/prince/music.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef PRINCE_SOUND_H
-#define PRINCE_SOUND_H
+#ifndef PRINCE_MUSIC_H
+#define PRINCE_MUSIC_H
#include "audio/midiplayer.h"
#include "common/memstream.h"
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 6cca0b9fb3..fcdf3f5fa2 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -49,7 +49,7 @@
#include "prince/debugger.h"
#include "prince/object.h"
#include "prince/mob.h"
-#include "prince/sound.h"
+#include "prince/music.h"
#include "prince/variatxt.h"
#include "prince/flags.h"
#include "prince/font.h"