- 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)
This commit is contained in:
Pav Lucistnik 2004-08-03 22:27:27 +00:00
parent 9fc19b14a3
commit 99fb36c32d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115364
3 changed files with 50 additions and 0 deletions

View file

@ -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[]) {

View file

@ -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;

View file

@ -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) {