diff options
| author | pav <pav@FreeBSD.org> | 2004-08-04 06:27:27 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-08-04 06:27:27 +0800 |
| commit | 8fc41f53c9bf41c8ba6ee322d3df8ea524ee36ce (patch) | |
| tree | 27fa66f5fa78434fb630815d51c6c412d931430d /games | |
| parent | 83d4c9e1ef7b54de22c37135c6c933c5062eda7e (diff) | |
| download | freebsd-ports-gnome-8fc41f53c9bf41c8ba6ee322d3df8ea524ee36ce.tar.gz freebsd-ports-gnome-8fc41f53c9bf41c8ba6ee322d3df8ea524ee36ce.tar.zst freebsd-ports-gnome-8fc41f53c9bf41c8ba6ee322d3df8ea524ee36ce.zip | |
- Fix conjuration with gcc-3.4.2
Spellbook page: 69949
Incantations provided by: Andreas Braml <a.strich.b@web.de>
Tested on: simon (the sorcerer 1)
Diffstat (limited to 'games')
| -rw-r--r-- | games/scummvm/files/patch-base-main.cpp | 11 | ||||
| -rw-r--r-- | games/scummvm/files/patch-scumm-actor.cpp | 19 | ||||
| -rw-r--r-- | games/scummvm/files/patch-scumm-debugger.cpp | 20 |
3 files changed, 50 insertions, 0 deletions
diff --git a/games/scummvm/files/patch-base-main.cpp b/games/scummvm/files/patch-base-main.cpp new file mode 100644 index 000000000000..3f0bf6860042 --- /dev/null +++ b/games/scummvm/files/patch-base-main.cpp @@ -0,0 +1,11 @@ +--- base/main.cpp.orig Tue Aug 3 15:56:29 2004 ++++ base/main.cpp Tue Aug 3 15:56:41 2004 +@@ -262,7 +262,7 @@ + + // Free up memory + delete engine; +-}; ++} + + #ifndef _WIN32_WCE + int main(int argc, char *argv[]) { diff --git a/games/scummvm/files/patch-scumm-actor.cpp b/games/scummvm/files/patch-scumm-actor.cpp new file mode 100644 index 000000000000..119b0437f071 --- /dev/null +++ b/games/scummvm/files/patch-scumm-actor.cpp @@ -0,0 +1,19 @@ +--- scumm/actor.cpp.orig Tue Aug 3 15:55:01 2004 ++++ scumm/actor.cpp Tue Aug 3 15:55:35 2004 +@@ -789,14 +789,14 @@ + return _V1_talkingActor; + else + return VAR(VAR_TALK_ACTOR); +-}; ++} + + void ScummEngine::talkingActor(int value) { + if (_gameId == GID_MANIAC && _version == 1) + _V1_talkingActor = value; + else + VAR(VAR_TALK_ACTOR) = value; +-}; ++} + + void ScummEngine::showActors() { + int i; diff --git a/games/scummvm/files/patch-scumm-debugger.cpp b/games/scummvm/files/patch-scumm-debugger.cpp new file mode 100644 index 000000000000..952eeb4db710 --- /dev/null +++ b/games/scummvm/files/patch-scumm-debugger.cpp @@ -0,0 +1,20 @@ +--- scumm/debugger.cpp.orig Tue Aug 3 15:55:47 2004 ++++ scumm/debugger.cpp Tue Aug 3 15:56:18 2004 +@@ -57,7 +57,7 @@ + va_end(va); + + debug(buf); +-}; ++} + + ScummDebugger::ScummDebugger(ScummEngine *s) + : Common::Debugger<ScummDebugger>() { +@@ -592,7 +592,7 @@ + + DebugPrintf("Unknown flag. Type 'Debug ?' for syntax\n"); + return true; +-}; ++} + + bool ScummDebugger::Cmd_DebugLevel(int argc, const char **argv) { + if (argc == 1) { |