diff options
| author | Norbert Lange | 2009-08-16 16:39:34 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-16 16:39:34 +0000 |
| commit | c96affd0c1e5480fe1a4a3d3e82583c795570d21 (patch) | |
| tree | 3f3a71bc02976024345c5c3e44534055d9c9c4cd /engines/tinsel | |
| parent | 2b147c57161cdacf3cdc5bc572ce46160cbd6b5e (diff) | |
| parent | ce30a513acdaab2ca5eacd136cc80ade1beabb3a (diff) | |
| download | scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.gz scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.bz2 scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.zip | |
merge with trunk
svn-id: r43443
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/actors.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/scene.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/tinlib.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp index e9d0c9f79f..15211c60aa 100644 --- a/engines/tinsel/actors.cpp +++ b/engines/tinsel/actors.cpp @@ -1185,7 +1185,7 @@ SCNHANDLE GetActorTalkFilm(int ano) { void SetActorTalking(int ano, bool tf) { assert(ano > 0 && ano <= NumActors); // illegal actor number - actorInfo[ano - 1].bTalking = tf;; + actorInfo[ano - 1].bTalking = tf; } bool ActorIsTalking(int ano) { diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp index 0b563376f8..a9ad9617c0 100644 --- a/engines/tinsel/scene.cpp +++ b/engines/tinsel/scene.cpp @@ -132,7 +132,7 @@ const SCENE_STRUC *GetSceneStruc(const byte *pStruc) { // Copy appropriate fields into tempStruc, and return a pointer to it const byte *p = pStruc; - memset(&tempStruc, sizeof(SCENE_STRUC), 0); + memset(&tempStruc, 0, sizeof(SCENE_STRUC)); tempStruc.numEntrance = READ_UINT32(p); p += sizeof(uint32); tempStruc.numPoly = READ_UINT32(p); p += sizeof(uint32); diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 957c4f7626..b97f8841ef 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -359,7 +359,7 @@ typedef SCROLL_MONITOR *PSCROLL_MONITOR; */ static void ScrollMonitorProcess(CORO_PARAM, const void *param) { int Loffset, Toffset; - const SCROLL_MONITOR *psm = (const SCROLL_MONITOR *)param;; + const SCROLL_MONITOR *psm = (const SCROLL_MONITOR *)param; // COROUTINE CORO_BEGIN_CONTEXT; |