Commit Graph

6812 Commits

Author SHA1 Message Date
Max Horn
1d40ce68c2 get rid of explicit redMask/blueMask and use redBlueMask instead (this will be useful should we choose to templatize the scalers for 555/565 mode optimizations)
svn-id: r10451
2003-09-27 23:59:09 +00:00
Jamieson Christian
4dcb829e78 Timer services are now available through g_timer, so
you don't have to go through the Engine to get to them.

svn-id: r10450
2003-09-27 23:59:00 +00:00
Jamieson Christian
072bf0f476 Fixed program crash when trying to switch to a
video mode that isn't supported (such as going
to fullscreen under COMI with a 3x scaler and
a video card that doesn't like 1920x1440 LOL).

The program still terminates when this happens,
due to the suboptimal way we make the switch to
another video mode. (By the time we find out
that we can't make the switch, it's too late to
revert back). But at least it doesn't crash.

svn-id: r10449
2003-09-27 23:41:57 +00:00
Max Horn
b2b9a7cb07 cheak doxygen comments
svn-id: r10448
2003-09-27 23:11:26 +00:00
Max Horn
9b27f7307a cleanup
svn-id: r10447
2003-09-27 23:11:25 +00:00
Jamieson Christian
44c0654ffd Fixed template function compile quirks under MSVC6.
Apparently MSVC6 does not like overloading of template
functions when the template arguments vary between
versions of the overloaded function. I replaced
interpolate16 with functions that have two different
names, so MSVC6 won't see them as being the same
function with [it insists] the same number of template
arguments.

svn-id: r10446
2003-09-27 22:53:24 +00:00
Max Horn
80a8bca2c1 cleanup
svn-id: r10445
2003-09-27 22:53:09 +00:00
Max Horn
ca95c17e64 merged in some more changes/improvements by _Q; cleanup
svn-id: r10444
2003-09-27 22:27:12 +00:00
Max Horn
f9e025d13c fix for bug #813136
svn-id: r10443
2003-09-27 22:12:01 +00:00
Max Horn
24d74274cf proposal for revised scaler keyboard shortcuts
svn-id: r10442
2003-09-27 21:41:10 +00:00
Max Horn
e306de2192 updated NEWS a bit
svn-id: r10441
2003-09-27 21:23:45 +00:00
Max Horn
90727ece4d don't use tabs in the README
svn-id: r10440
2003-09-27 21:22:49 +00:00
Max Horn
7d2fff0012 added hq2x scaler
svn-id: r10439
2003-09-27 21:20:00 +00:00
Max Horn
e032e79a4a added hq2x scaler (no, I am not going to add hq4x anytime soon. It would be another 4-5000 lines of code, and scaler.cpp already takes far too long to compile. Maybe we should seperate the scalers into several files in common/scaler/ ?)
svn-id: r10438
2003-09-27 21:19:17 +00:00
Max Horn
6f978e9e30 some minor cleanup
svn-id: r10437
2003-09-27 20:31:19 +00:00
Max Horn
36816c0c8d add some descumm TODOs
svn-id: r10436
2003-09-27 20:30:46 +00:00
Max Horn
32d85b4ae0 some cleanup / removed some code duplication (more should be done, but I don't have the time right now). Since I lack data files to test this, I'd be grateful if somebody could check whether I broke something
svn-id: r10435
2003-09-27 19:43:06 +00:00
Max Horn
0b0bbed4e2 don't use delete to free memory allocated by malloc
svn-id: r10434
2003-09-27 18:18:05 +00:00
Max Horn
d87f65ff06 added a FIXME (regarding optimization) to INTERPOLATE; added new template function interpolate16 which is used by hq3x (advantage of the old trick which abused Q_INTERPOLATE: smaller & better optimized code; very easy to adapt the function for other uses, like for hq2x/hq3x. Drawback: scaler.cpp takes even longer to compile now :-)
svn-id: r10433
2003-09-27 18:09:50 +00:00
Torbjörn Andersson
1d831d0cea cleanup
svn-id: r10432
2003-09-27 17:41:02 +00:00
Torbjörn Andersson
54a2470c9f Began unifying the function documentation in driver96.h with the one in the
individual files, into what I hope are doxygen ones.

svn-id: r10431
2003-09-27 17:00:15 +00:00
Max Horn
49d2a22b42 OSystem changes: removed create_thread() method (not needed anymore; 'pure' threads aren't very portable anyway, better we only use timers); introduced OSystem::TimerProc type
svn-id: r10430
2003-09-27 16:54:11 +00:00
Torbjörn Andersson
e19e7c879a Save enough information about the currently playing music before the
credits so that it can be properly resumed afterwards.

svn-id: r10429
2003-09-27 16:10:43 +00:00
Torbjörn Andersson
796fcfff7e Removed inaccurate comment
svn-id: r10428
2003-09-27 16:05:40 +00:00
Torbjörn Andersson
d1df731855 Removed CopyScreenBuffer() since it was a no-op anyway.
svn-id: r10427
2003-09-27 15:44:26 +00:00
Torbjörn Andersson
bac0fab43d cleanup
svn-id: r10426
2003-09-27 15:38:42 +00:00
Torbjörn Andersson
442fd0cdf8 I don't think UpdatePaletteMatchTable() has to write the table to file. In
fact, I'm not even sure the !data case ever happens.

svn-id: r10425
2003-09-27 15:30:17 +00:00
Torbjörn Andersson
3278a0dce6 cleanup
svn-id: r10424
2003-09-27 15:20:15 +00:00
Jonathan Gray
f9352cfc1c add alternate sword2 target for people who want to use the gui for game detection when the game is either a) on CD b) in a bunch of seperate directories in a structure like that of the CD. Of course pointing ScummVM at such things with the normal target via command line or config file work fine. As everyone awake at the moment only has the sold out version, this is specific to that. I don't know what files are at the root of the original CD we can use for detection purposes
svn-id: r10423
2003-09-27 15:01:35 +00:00
Torbjörn Andersson
8ad28e3a7e More cleanup, and I've replaced most - not quite all - of BS2's debug
message functions with our own.

We still need to go through them and assign sensible debug levels to them.

svn-id: r10422
2003-09-27 11:02:58 +00:00
Jonathan Gray
5f2d799fd2 updates from _Q
svn-id: r10421
2003-09-27 06:33:22 +00:00
Jamieson Christian
44bfb7b866 Removed RTTI except where required
(i.e. scummvm/scumm/mixer.cpp)

svn-id: r10420
2003-09-27 02:33:17 +00:00
Paweł Kołodziejski
02efb31591 a little better
svn-id: r10419
2003-09-26 17:58:42 +00:00
Paweł Kołodziejski
3745b176b2 added v6 version of stamp object opcode
svn-id: r10418
2003-09-26 17:55:50 +00:00
Jonathan Gray
2ef1708333 stop gcc complaining
svn-id: r10417
2003-09-26 17:51:49 +00:00
Paweł Kołodziejski
a84f204b72 now more match dissassembly
svn-id: r10416
2003-09-26 17:33:58 +00:00
Torbjörn Andersson
f18b4addb8 cleanup
svn-id: r10415
2003-09-26 14:19:03 +00:00
Jamieson Christian
7f707acfb6 Converted the MPU-401 timer to use the Timer class.
Since this was the only place where we were using
create_thread, that method should be removable now.
I also removed the midi_driver_thread overrides
for the MorphOS and YPA1 (Palm) backends. These need
to be tested by their respective porters.

svn-id: r10414
2003-09-26 14:05:33 +00:00
Torbjörn Andersson
b21208e6a9 Some more reformatting / cleanup, and removal of comments that did nothing
but say who added what when. (No disrespect intended, but this information
means very little to us.)

svn-id: r10413
2003-09-26 10:07:18 +00:00
Torbjörn Andersson
b7a5024daf Ok, I'm stupid.
The initial sample is, indeed, two bytes, just like the rest of them, but
it really, really helps if you read it from the correct position in the
file.

After fixing that, it turned out that my changing of signedness of the
sample was also wrong. Funny how those two bugs almost cancelled each other
out. Almost.

I've made a few other changes as well, but they're just to clean things up
a bit. The credits music works for me, and I've played the game up to
arriving in Quaramonte, with no obvious music-related problems.

svn-id: r10412
2003-09-26 06:26:18 +00:00
Travis Howell
c03b99eab6 Small correction for simon1/2 Hebrew
svn-id: r10411
2003-09-26 05:34:52 +00:00
Travis Howell
68c060405c Add optional define for no console
svn-id: r10410
2003-09-26 00:09:09 +00:00
Jamieson Christian
a30eb131bb Fix for Bug [810564] ALL: missing instruments with native MT-32
As defined in Patch [811623] MT-32 patch for Bug 810564

Added a channel mask to MPU-401 devices so that --native-mt32
may force the device to use only the subset of MIDI channels
actually supported by the MT-32. Also added a best-guess
interpretation of iMuse Part priority in the SysEx 0x00 msg,
since part priorities become more of an issue when the
channel count is cramped.

svn-id: r10409
2003-09-25 22:32:05 +00:00
Torbjörn Andersson
f5d8300043 Really clear the screen during the credits.
svn-id: r10408
2003-09-25 13:04:46 +00:00
Torbjörn Andersson
a4b32b67e8 Reverted part of the previous change. Control panel music should work again
but the credits music is still broken. I'll have to take a closer look at
this later.

svn-id: r10407
2003-09-25 11:35:54 +00:00
Torbjörn Andersson
b9cc1725b7 Some minor fixes. Unfortunately I've noticed that there is some major sound
distortion in the credits music, and I haven't yet figured out what's
causing this.

svn-id: r10406
2003-09-25 10:02:52 +00:00
Paweł Kołodziejski
2122f11793 added HE game
svn-id: r10405
2003-09-25 06:12:04 +00:00
Torbjörn Andersson
99eee3fb84 Rewrote the music code to use a premix function instead of a timer. I'm
speculating that the timer didn't always fill the buffer quite fast enough
and that this is what caused the occasional popping noises.

Of course, I may have introduced all kinds of regressions - particularly
since I don't have any big-endian computer to test on - but we're all
friends here, right? :-)

svn-id: r10404
2003-09-25 06:11:07 +00:00
Paweł Kołodziejski
5f3f0bce7a update vc7 file
svn-id: r10403
2003-09-25 06:08:31 +00:00
Travis Howell
ab66db7cd0 Small cleanup to reduce amount of game id checks.
svn-id: r10402
2003-09-25 04:32:28 +00:00