Commit Graph
57228 Commits
Author SHA1 Message Date
Matthew Hoops 4e9e2f4fea PEGASUS: Fix possible timer "skip" when resuming
pause/resume need to treat things a bit differently from the normal setRate function. This caused a jump in a timer when resuming from the pause menu in certain cases, though not all the time.

Regression from b50cac637e, which was part of the fix for the lid animations.
2013-07-20 23:06:36 -04:00
Paul Gilbert b79fd7e965 TSAGE: Work on setup of R2R engine palette maps 2013-07-20 18:46:55 -04:00
Torbjörn Andersson a790fe0e80 TINSEL: Remove self-assignment (CID 1003626)
However, dreammaster has confirmed this line was in the original
so I'm leaving it commented-out in case there is a genuine bug
still lurking there.
2013-07-20 05:32:11 +02:00
Paul Gilbert a979ec6c97 LURE: Added explicit comment to switch block fall-through 2013-07-19 23:10:25 -04:00
Willem Jan Palenstijn 06cc30cf6c SCI: Add FIXME 2013-07-19 21:22:36 +02:00
Torbjörn Andersson da17953c12 TONY: Remove debug message from last commit. Oops. 2013-07-19 21:19:03 +02:00
Torbjörn Andersson c44d6ae60c TONY: Fix parameter to RMGfxSourceBuffer8RLEWordAA::init()
The method it is meant to override uses "const byte *buf" so this
one should too. I don't know if/when it's called, but fuzzie tells
me it should be a harmless change. Hopefully fixes CID 1003892.
2013-07-19 21:10:50 +02:00
Torbjörn Andersson 71ed35502e TEENAGENT: Add missing "break"s to switch cases
I think this is the correct thing to do, and that it won't have
any noticeable effect whatsoever.

Cases 29 and 30 happen in the first half of the game, in the
cantine, while case 42 happens in the second half of the game. By
the time you reach the point where case 42 does something, I don't
think it's possible to get back to cases 29 and 30, so when case
29 falls through neither 30 nor 42 will do anything.

CID 1003730, 1003731
2013-07-19 20:49:15 +02:00
Johannes Schickel 325f60cbd7 Merge pull request #345 from countingpine/patch-1
SCUMM: More precise Player_Mac::durationToSamples
2013-07-18 09:17:23 -07:00
Eugene Sandulenko 2c812ade01 Merge pull request #353 from clone2727/eventrec_timer_fix
ALL: Don't use EventRecorder at all when not compiled in
2013-07-18 08:15:28 -07:00
Paul Gilbert 2eb26ad02e TSAGE: Some further cleanup of R2R drive room 2013-07-17 22:02:24 -04:00
Paul Gilbert b7fbf23673 TSAGE: Fixes for R2R scanner dialog 2013-07-16 23:20:58 -04:00
D G Turner 7381fcdf30 TUCKER: Amend fix for bug #3614697 - "Spanish version uncompletable..."
The mof instruction needs to return 0 or 1 to continue execution, rather
than 2 which indicates to end table instruction execution. Using 0 as
this is most likely correct value.
2013-07-16 20:30:30 +01:00
Torbjörn Andersson e5e90434f3 TSAGE: Fix stray "You have no use for that." message
This would happen in Ringworld when clicking on the slot in the
flycycle. I have compared the behaviour to the original, and I
can't see any obvious differences after my change. CID 1003728
2013-07-16 19:19:45 +02:00
countingpine 96c4ebe77f SCUMM: Better Player_Mac::durationToSamples
Uses the fact that 4*480*480 == 225 << 12, and the identity
(a*b)>>n == (a>>n)*b + ((a%(1<<n))*b)>>n (assuming non-overflowing math),
except the rhs uses smaller intermediate values and does not overflow(*).
Compared to the original code, this uses 1 fewer division and eliminates
the rounding error.

(*) Technical note: In some cases the right hand side of the above
identity still has possibilities of intermediate overflow, but only if
b > (1 << n), or if (b << n) overflows, neither of which are true here.
2013-07-16 16:16:08 +01:00
Paul Gilbert e17095df2e TSAGE: Bugfixes for R2R drive room, and work on scanner modal dialog 2013-07-16 09:19:19 -04:00
Alyssa Milburn 8e9aefbf6e CONFIGURE: Use -Wno-long-long when we use -pedantic. 2013-07-16 11:00:34 +02:00
Eugene Sandulenko 0c52bfa43e CONFIGURE: Added more 64bit integers to probing 2013-07-15 19:26:02 +03:00
Eugene Sandulenko 6dc3768faa SWORD25: Fix compilation on some 32-bit systems 2013-07-15 19:19:45 +03:00
Eugene Sandulenko b7e3d52abc SWORD25: Replace Pluto with Tamed Pluto for increased compatibility
Still saves are incompatible but at least this now has enhanced
debugging capabilities.
2013-07-15 19:02:34 +03:00
Johannes Schickel 3e246b3e67 Merge pull request #323 from tobiatesan/test_for_common
Test for common
2013-07-15 05:26:13 -07:00
Johannes Schickel 6a1112f98f GUI: Mark some intentional fall throughs in switches.
All of these are for handling kCloseCmd.
2013-07-15 13:44:24 +02:00
Johannes Schickel ddcfdf5329 GUI: Allow the event recorder dialog to be closed.
This is a regression from 6e4217e1ba.

setResult does not automatically close the dialog. However,
Dialog::handleCommand will close the dialog when kCloseCmd is received.
2013-07-15 13:40:59 +02:00
Eugene Sandulenko 9572bc6e30 RECORDER: Fix wrong argument order 2013-07-15 14:31:34 +03:00
Eugene Sandulenko 8cdca523ea AGI: Mark fall-through. Detected by CID 1003771 2013-07-15 12:00:10 +03:00
Eugene Sandulenko e809ebb904 AGI: Fix CID 1003768. Missing break in switch 2013-07-15 11:59:59 +03:00
Eugene Sandulenko ce057f896f AGI: Fix CID 1003769. Missing break in switch 2013-07-15 11:54:26 +03:00
Eugene Sandulenko 059fa15d14 DEVTOOLS: Fix CID 1022207. Missing break in switch 2013-07-15 11:51:57 +03:00
Eugene Sandulenko e0e6b95384 INSANE: Fix CID 1003734. Missing break in switch 2013-07-15 11:48:05 +03:00
Eugene Sandulenko b1c886334d INSANE: Fix CID 1003733. Missing break in switch.
In fact the code was wrong there due to copy-paste error
2013-07-15 11:47:51 +03:00
Eugene Sandulenko 7ae3386090 SAGA: Fix CID 1002507. Unused pointer value. 2013-07-15 11:29:46 +03:00
Paul Gilbert 96e1d3b09a TSAGE: Added R2R ability to combine items. Further bugfixes for landing bay 2013-07-14 15:38:22 -04:00
Sven Hesse 5e835ef915 RECORDER: Fix indenting 2013-07-14 19:04:09 +02:00
Sven Hesse 989ea7cb56 JANITORIAL: Remove trailing whitespace 2013-07-14 19:01:47 +02:00
Eugene Sandulenko 6e4217e1ba RECORDER: Fix CID 1046887. Missing break in switch 2013-07-14 19:35:17 +03:00
Eugene Sandulenko 54d0eef6f2 RECORDER: Fix CID 1046882. Uninitalized variables 2013-07-14 19:30:35 +03:00
Eugene Sandulenko 9efff8f350 RECORDER: Rename class variables in accoudance with our code style 2013-07-14 19:27:13 +03:00
Eugene Sandulenko 6751a385a8 RECORDER: Fix CID 1046883. Uninitialized variables 2013-07-14 19:24:47 +03:00
Eugene Sandulenko 51046d0ce7 RECORDER: Fix CID 1046881. Unused value 2013-07-14 19:22:53 +03:00
Eugene Sandulenko e3a11085a9 RECORDER: Fix CID 1046888. Wrong check. 2013-07-14 19:20:06 +03:00
Eugene Sandulenko 977038e847 RECORDER: Rename class variable in accoudance with our code style. 2013-07-14 19:16:01 +03:00
Eugene Sandulenko c1397788f2 RECORDER: Fix CID 1046884. Uninitialized class variables. 2013-07-14 19:14:00 +03:00
Eugene Sandulenko aaaf466c71 RECORDER: Fix CID 1046886. Uninit class variables. 2013-07-14 19:03:29 +03:00
Paul Gilbert cddf499942 TSAGE: Fix for returning to landing bay from crane controls 2013-07-14 11:39:32 -04:00
D G Turner 485118ecd9 TUCKER: Add support for skipping unhandled/invalid instructions.
This ensures that if any unhandled/invalid instructions are present,
they are skipped, rather than locking up engine execution.

This is a secondary fix for bug #3614697 - "Spanish version
uncompletable at end of 2nd part" and any other future bugs of this
type.
2013-07-14 05:07:11 +01:00
D G Turner 1946dead77 TUCKER: Fix for bug #3614697 - "Spanish version uncompletable..."
This add support for the unhandled "mof" instruction present in the
Spanish version. This effectively skips it as a NOP/invalid, which
prevents it locking up the game at the end of the 2nd part.
2013-07-14 05:04:02 +01:00
Paul Gilbert a986df44e8 TSAGE: Fixes for R2R Crane Controls 2013-07-13 17:11:11 -04:00
Torbjörn Andersson d0df423575 DEVTOOLS: Fix unimportant memory/resource leaks
CID 1022280, 1022281, 1022282
2013-07-13 23:08:32 +02:00
Torbjörn Andersson a5864d992d DEVTOOLS: Fix unimportant memory/resource leaks
CID 1022283, 1022284, 1022285
2013-07-13 22:58:27 +02:00
Paul Gilbert 5ed7bec4c6 TSAGE: Extra comments for crane control scene 2013-07-12 21:07:08 -04:00