aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--doc/10.tex1
-rw-r--r--gob/inter_v1.cpp2
-rw-r--r--gob/music.cpp2
-rw-r--r--gui/credits.h2
-rw-r--r--saga/actor.h2
-rwxr-xr-xtools/credits.pl1
7 files changed, 8 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 8ebcfd8f66..cf8eedeb85 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -177,6 +177,7 @@ Special thanks to
Kevin Carnes - For Scumm16, the basis of ScummVM's older gfx codecs
Ivan Dubrov - For contributing the initial version of the Gobliiins
engine
+ Joachim Eberhar - For numerous contributions to documentation
Jezar - For his freeverb filter implementation
Jim Leiterman - Various info on his FM-TOWNS/Marty SCUMM ports
lloyd - For deep tech details about C64 Zak & MM
diff --git a/doc/10.tex b/doc/10.tex
index eb61834036..a56555a553 100644
--- a/doc/10.tex
+++ b/doc/10.tex
@@ -272,6 +272,7 @@ And to all the contributors, users, and beta testers we've missed. Thanks!
Canadacow & \textit{For the original MT-32 emulator}\\
Kevin Carnes & \textit{For Scumm16, the basis of ScummVM's older gfx codecs}\\
Ivan Dubrov & \textit{For contributing the initial version of the Gobliiins engine}\\
+ Joachim Eberhard & \textit{For numerous contributions to documentation}\\
Jezar & \textit{For his freeverb filter implementation}\\
Jim Leiterman & \textit{Various info on his FM-TOWNS/Marty SCUMM ports}\\
lloyd & \textit{For deep tech details about C64 Zak \& MM}\\
diff --git a/gob/inter_v1.cpp b/gob/inter_v1.cpp
index e1a3f7afce..e34a1ed6b1 100644
--- a/gob/inter_v1.cpp
+++ b/gob/inter_v1.cpp
@@ -635,7 +635,7 @@ void Inter_v1::setupOpcodes(void) {
};
_opcodesDrawV1 = opcodesDraw;
- _opcodesFuncV1 = opcodesFunc;
+ _opcodesFuncV1 = opcodesFunc; // EGroupe
_opcodesGoblinV1 = opcodesGoblin;
}
diff --git a/gob/music.cpp b/gob/music.cpp
index 187283c16c..3f0508efeb 100644
--- a/gob/music.cpp
+++ b/gob/music.cpp
@@ -396,7 +396,7 @@ void Music::playBgMusic(void) {
void Music::playTrack(const char *trackname) {
if (_playing) return;
- debug(2, "Music::playTrack()");
+ debug(2, "Music::playTrack(%s)", trackname);
unloadMusic();
for (int i = 0; i < ARRAYSIZE(_tracksToFiles); i++)
if (!scumm_stricmp(trackname, _tracksToFiles[i][0])) {
diff --git a/gui/credits.h b/gui/credits.h
index 4a647c96d7..c46e53fc5f 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -207,6 +207,8 @@ static const char *credits[] = {
"\\C\\c2""For Scumm16, the basis of ScummVM's older gfx codecs",
"\\C\\c0""Ivan Dubrov",
"\\C\\c2""For contributing the initial version of the Gobliiins engine",
+"\\C\\c0""Joachim Eberhard",
+"\\C\\c2""For numerous contributions to documentation",
"\\C\\c0""Jezar",
"\\C\\c2""For his freeverb filter implementation",
"\\C\\c0""Jim Leiterman",
diff --git a/saga/actor.h b/saga/actor.h
index 3fdd0697fb..b832f51cba 100644
--- a/saga/actor.h
+++ b/saga/actor.h
@@ -40,7 +40,7 @@ namespace Saga {
class HitZone;
-//#define ACTOR_DEBUG only for actor pathfinding debug!
+#define ACTOR_DEBUG //only for actor pathfinding debug!
#define ACTOR_BARRIERS_MAX 16
diff --git a/tools/credits.pl b/tools/credits.pl
index a734ddbc5b..09ddfbe3ea 100755
--- a/tools/credits.pl
+++ b/tools/credits.pl
@@ -650,6 +650,7 @@ begin_credits("Credits");
add_person("", "Canadacow", "For the original MT-32 emulator");
add_person("Kevin Carnes", "", "For Scumm16, the basis of ScummVM's older gfx codecs");
add_person("Ivan Dubrov", "", "For contributing the initial version of the Gobliiins engine");
+ add_person("Joachim Eberhard", "joachimeberhard", "For numerous contributions to documentation");
add_person("", "Jezar", "For his freeverb filter implementation");
add_person("Jim Leiterman", "", "Various info on his FM-TOWNS/Marty SCUMM ports");
add_person("", "lloyd", "For deep tech details about C64 Zak &amp; MM");