agent-q
92d0216db1
Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
2011-05-21 16:01:26 +01:00
agent-q
4076a0466d
GUI/DS: Make 99 the maximum number of save slots displayed on the GMM load/save screens on the DS port.
2011-05-21 15:56:42 +01:00
agent-q
f1903004c0
GUI: Prevent the GUI code from incorrectly reloading the theme when the builtin theme is used.
2011-05-21 15:55:36 +01:00
agent-q
3ce4b76b0d
DS/SAGA: Due to what looks like a compiler bug, having one Common::Array template inside another causes the DS build to crash during Common::Array::resize(). The only fix I can find is to make the internal byte array a normal malloc'ed() buffer. This way, the code runs fine. Need to dig into the assembly output for this to find out what's truly going on with the original code.
2011-05-21 15:54:20 +01:00
agent-q
6fdec4dfac
DS: Various changes
...
- Enable libmad
- Remove forced include of scummsys.h, it caused problems in the forbidden symbols code.
2011-05-21 15:51:13 +01:00
agent-q
987d966acc
DS: Prevent arrays from growing by 32 elements inside 'operator='. I'm concerned that this could increase memory usage on the DS, but too scared to make the change for all builds of ScummVM.
2011-05-21 15:48:44 +01:00
agent-q
a9b5d5e2bb
DS: Fix some OPL data which was incorrectly freed from the main heap on the DS port
2011-05-21 15:46:59 +01:00
agent-q
92a71f7452
DS: Port of changes from branch-1-2-0 that I should really have moved into the trunk.
...
"DS: Prevent the command line help string from being included in the binary."
5f3a90a5f6
"GUI: Allow disabling of Mass Add dialog. Saves a few Kb of binary size on the DS, and is not particularly useful on that platform."
240ff87cf4
"GUI: Don't search for theme zip files on startup when running on the DS. Themes aren't supported anyway, and the search severely delays startup."
fe3b18ce0d
2011-05-21 15:45:51 +01:00
Willem Jan Palenstijn
dd6b5698b1
SCI: Fix probable alt/shift mixup
...
A check for alt was changed into this check for shift in the
cleanup commit 906f024831 .
(cherry picked from commit 0da3f8d8a5 )
2011-05-21 16:04:03 +02:00
Willem Jan Palenstijn
0da3f8d8a5
SCI: Fix probable alt/shift mixup
...
A check for alt was changed into this check for shift in the
cleanup commit 906f024831 .
2011-05-21 16:02:51 +02:00
athrxx
2ef8e9a202
FM-TOWNS AUDIO: fix gcc warnings
2011-05-20 20:28:18 +02:00
athrxx
2d1fa6c3f8
FM-TOWNS AUDIO: fix thread lockups and cleanup
...
- fixed lockup situation in imuse destructor (only concerning the fm-towns driver)
- fixed lockup situation when AudioCDManager functions get called
(in both cases both the main thread and the mixer thread would get locked in different mutex belonging to the other thread)
2011-05-20 20:28:15 +02:00
Johannes Schickel
ffc2a93daa
AUDIO: Remove leftover "forward" declaration after real declaration in the TOWNS midi code.
2011-05-20 19:30:22 +02:00
eriktorbjorn
f6b3b72eae
SWORD25: Don't assume that all locales use decimal point
...
The trydecpoint() function *is* used, though probably only in
countries which don't use a decimal point. We can't use the ISO C
locale functions here because they're not fully implemented on
some platforms, e.g. Android. Hopefully this method will work.
2011-05-20 18:34:42 +02:00
Paul Gilbert
cbf7f740e4
SWORD25: Re-implement two LUA library I/O functions necessary for detecting and creating the config.lua configuration file
2011-05-20 18:45:33 +10:00
Matthew Hoops
5fdf2796d6
GRAPHICS: Cleanup formatting
2011-05-19 18:38:09 -04:00
Matthew Hoops
1ee5ef9c6f
GRAPHICS: Allow auxiliary surface functions to be used for 32bpp surfaces
2011-05-19 18:38:09 -04:00
CeRiAl
e27dd8ac4e
WINCE: Change plugin extensions from .dll to .plugin - fixes erroneous loading of runtime-dlls
2011-05-20 06:31:23 +08:00
Bastien Bouclet
da3f670898
MOHAWK: Compensate movie encoding difference between Myst ME and Myst original, to fix a crash in the clock tower.
2011-05-19 22:06:37 +02:00
Paul Gilbert
fcae7bb497
SWORD25: Fix to properly signal when movie playback has ended
2011-05-19 21:52:45 +10:00
Matthew Hoops
410be8bb79
GRAPHICS: Update links to info on PICT+JPEG
2011-05-18 23:21:20 -04:00
Matthew Hoops
d4c9298392
Merge remote branch 'upstream/master' into pegasus
2011-05-18 18:23:37 -04:00
Eugene Sandulenko
ce69c2e22e
I18N: Fixed errors and smoothness of Ukrainian translation
2011-05-19 00:34:25 +03:00
Eugene Sandulenko
5fbc9c9253
I18N: Update Russian translation
2011-05-19 00:34:24 +03:00
Eugene Sandulenko
cf107e24be
I18N: Fixed errors and smoothness of Ukrainian translation
2011-05-19 00:30:16 +03:00
Eugene Sandulenko
407a05a98d
I18N: Update Russian translation
2011-05-19 00:29:52 +03:00
Matthew Hoops
d1f907485e
SWORD25: Implement TheoraDecoder::pauseVideoIntern()
2011-05-18 10:05:14 -04:00
Matthew Hoops
14e1cc728f
SWORD25: Properly use endOfVideo()
2011-05-18 10:05:14 -04:00
Matthew Hoops
affb6a38a1
GRAPHICS: Add some docs and sanity checks to the YUV to RGB code
2011-05-18 10:05:13 -04:00
Matthew Hoops
f8323cc672
SWORD25: Make Theora handle the case when the packet eos is not set
2011-05-18 10:05:13 -04:00
Matthew Hoops
0addffbfd3
GRAPHICS: Add a YUV to RGB table lookup for use with Theora
...
Based on the video/mpeg_player.* one, which is based on lots of other things (too many to name, go see the file)
2011-05-18 10:05:13 -04:00
Matthew Hoops
f559741bfc
SWORD25: Fix a/v sync with using the TheoraDecoder standalone
...
Hopefully should fix a/v sync from in-game. If not, the engine needs to be changed slightly
2011-05-18 10:05:13 -04:00
Christoph Mallon
5813ac1bcf
TINSEL: Remove declarations for non-existent functions FindObject() and GetNextObject().
...
Signed-off-by: Max Horn <max@quendi.de >
2011-05-18 15:30:33 +02:00
Christoph Mallon
f143668db4
TINSEL: Correctly handle the pDispList OBJECT linked lists, i.e. use OBJECT** for a pointer to the head.
...
Signed-off-by: Max Horn <max@quendi.de >
2011-05-18 15:30:23 +02:00
Max Horn
9c01c38512
TINSEL: Document pDispList OBJECT linked list 'trick'
2011-05-18 14:06:56 +02:00
Max Horn
d85700bb94
TINSEL: Revert commit 43ca9c86ab to fix bug #3303799
...
Commit 43ca9c86ab causes segfaults when trying to start a game in tinsel.
However, the code in question still should be investigated, as it
casts OBJECT** pointers to OBJECT*. Very fishy.
2011-05-18 13:47:41 +02:00
Max Horn
904739cc00
COMMON: Document that Stream API is meant to imitate ISO C FILE semantics
2011-05-18 13:06:41 +02:00
Max Horn
39ab4a2dc4
AGI: Constify stuff
2011-05-18 13:06:33 +02:00
Paul Gilbert
687d033d28
TSAGE: Further sound driver installation logic
2011-05-18 20:32:40 +10:00
strangerke
f830d68130
TSAGE: Fix several glitches in scene 4000
2011-05-18 07:35:07 +02:00
strangerke
16a0d8e7ad
TSAGE: Fix bug in scene 2280 (when picking up left boots)
2011-05-18 01:49:53 +02:00
strangerke
0ff4897938
TSAGE: Fix a serie of bugs in scenes 4045 and 4000
2011-05-18 01:38:08 +02:00
Willem Jan Palenstijn
a47d2aaa6f
BUILD: Reset executable flag of configure
2011-05-18 00:07:46 +02:00
CeRiAl
fb6b61f14e
WINCE: Add win32-provider.o to backends/module.mk for WinCE (fixes dynamic plugins)
2011-05-18 06:04:27 +08:00
CeRiAl
5ed939472a
I18N: Small fix for german translation
2011-05-18 06:04:26 +08:00
CeRiAl
70fdec6411
WINCE: Replace custom massadd with the global one (shows progress now)
...
Replaces the formerly custom WinCE massadd function (CELauncherDialog::automaticScanDirectory) with the global one, which is better because it shows progress (massadd in combination with a uncached plugin build takes a very long time to complete and user thinks device has crashed when no progress is shown).
Also fixes the additional custom WinCE about dialog (text was cut off before).
2011-05-18 06:04:25 +08:00
CeRiAl
e46f7dc1c0
WINCE: Fix mouse coordinate scaling when ARM scaler support is active
2011-05-18 06:04:24 +08:00
CeRiAl
6db6d69eed
WINCE: Enable building of plugins with normal configure/make
...
Enables building of plugin .dlls without a custom Makefile.
Also removes generation of scummvm.exe.map from configure script.
2011-05-18 06:04:23 +08:00
Johannes Schickel
582827df40
AUDIO: Remove SVN Id/URL keywords from a few newly added files.
2011-05-17 23:23:44 +02:00
Johannes Schickel
8a46c017cf
GUI: Fix for bug #3303501 "Switching from HQ2x->HQ3x crashes ScummVM".
2011-05-17 23:16:40 +02:00