Commit Graph

29778 Commits

Author SHA1 Message Date
Eugene Sandulenko
eb3d556e15 CGE: Plug memory leak. CID 1003914 2013-04-26 07:59:53 +03:00
Paul Gilbert
ff132ee2d4 Merge branch 'master' of https://github.com/scummvm/scummvm 2013-04-26 10:54:52 +10:00
Paul Gilbert
5d48d85219 HOPKINS: Fix Return to Launcher 2013-04-26 10:50:08 +10:00
Strangerke
4b7f352768 HOPKINS: Fix bug #3611566 2013-04-26 00:41:04 +02:00
Willem Jan Palenstijn
1841d18497 TOON: Fix memory leak 2013-04-25 23:22:55 +02:00
Willem Jan Palenstijn
38fa74d24a SCI: Fix (unlikely) memory leak 2013-04-25 20:48:32 +02:00
Filippos Karapetis
d8eb01a729 SCI: Add the French floppy version of GK1 (bug #3611487) 2013-04-25 11:10:36 +03:00
Filippos Karapetis
c47a516430 SCI: Reorder the LSL3 detection entries a bit 2013-04-25 11:08:11 +03:00
Filippos Karapetis
40865bc79e SCI: Add another version of LSL3 (bug #3611488) 2013-04-25 11:07:01 +03:00
Filippos Karapetis
41e02baff1 SCI: Fix scaling in the back room of the bookstore in GK1 2013-04-25 02:36:03 +03:00
Willem Jan Palenstijn
53f38aeff1 DRASCULA: Remove dead code 2013-04-24 23:01:07 +02:00
Thierry Crozat
5fc59f9bd8 SWORD1: Error our in case the resource handle is not found in lockScript
This should never happen, so as per wjp suggestion makes this an error.
2013-04-24 21:55:34 +01:00
Thierry Crozat
ff1bdc7f58 SWORD1: Avoid possible dereferencing of a null pointer
CID 1003605
2013-04-24 21:24:58 +01:00
Torbjörn Andersson
621364edae LURE: Fix bounds checking
CID 1003986 and CID 1003990.
2013-04-24 20:50:06 +02:00
Matthew Hoops
829847cb88 SCI: Fix kMessage REF subop ordering
Thanks to waltervn for testing values from running in DOSBox.

Fixes bug #3034704
2013-04-23 22:34:37 -04:00
Eugene Sandulenko
3c0c6a5cb1 SWORD25: Plug memory leak. CID 1003589 2013-04-24 01:23:31 +03:00
Eugene Sandulenko
cfbc8be757 SCUMM: Fix non-terminated string. CID 1003867 2013-04-24 01:08:09 +03:00
athrxx
0223742a5a KYRA: (EOB) - fix original savefile import
(some monsters were not properly assigned to their spots)
2013-04-23 23:55:31 +02:00
athrxx
2e231150eb KYRA: (EOB) - minor changes to debugger
- display some more info in show_position
- remove unused variable
2013-04-23 22:26:23 +02:00
Matthew Hoops
f4a566afb1 SCUMM: Fix football2002 field coordinates 2013-04-23 16:19:23 -04:00
Einar Johan Trøan Sømåen
182c1a1ff5 WINTERMUTE: Cap the renderqueue to 800. 2013-04-23 11:28:18 +02:00
Einar Johan Trøan Sømåen
86b93a84c9 WINTERMUTE: Fix non-dirty-rect render-path. 2013-04-23 11:28:18 +02:00
Matthew Hoops
0209ce4e3a SCUMM: Fix a bug in football's nextPoint U32 opcode
Seems to fix bug #3495704
2013-04-22 17:22:29 -04:00
Willem Jan Palenstijn
617b9cf613 SWORD2: Fix reference to out-of-scope variable 2013-04-22 22:27:19 +02:00
Willem Jan Palenstijn
22d8fe9544 SWORD2: Fix (unlikely) memory leak 2013-04-22 22:22:43 +02:00
Willem Jan Palenstijn
3943d34034 SWORD1: Remove dead code 2013-04-22 22:18:52 +02:00
athrxx
581031a55d KYRA: (EOB) - fix bug #3596547
(EOB1: Door Buttons Don't Work)
2013-04-22 21:23:27 +02:00
athrxx
3e1ccff79d KYRA: (EOB) - minor fix to door opening/closing in EOB1 2013-04-22 21:23:25 +02:00
athrxx
cdff19324c KYRA: (EOB) - add debugger functions
(open_door, close_door)
2013-04-22 21:23:23 +02:00
Einar Johan Trøan Sømåen
6434258722 WINTERMUTE: Mark Chivalry as ADGF_TESTING. 2013-04-22 16:24:26 +02:00
Einar Johan Trøan Sømåen
0695739239 WINTERMUTE: Use the theme-path to find scummodern.zip 2013-04-22 16:14:11 +02:00
Alyssa Milburn
1cec3beb8c MOHAWK: add detection entry from bug #3610725 2013-04-22 11:19:30 +02:00
athrxx
65caa0500f KYRA: (EOB) - add some debugger functions
(show_position, set_position)
2013-04-22 01:02:41 +02:00
Strangerke
a0869fd391 NEWS: Mention Hopkins support, enable engine by default 2013-04-21 23:27:19 +02:00
Willem Jan Palenstijn
b91da80756 AGI: Fix delete/delete[] 2013-04-21 15:34:22 +02:00
Johannes Schickel
9ffec86b5d Merge pull request #324 from eriktorbjorn/kyra-midifade
KYRA: Fix MIDI fade-out behaviour
2013-04-21 05:23:50 -07:00
Strangerke
2d41bae732 HUGO: Add missing initializations in intro constructors. CID 1002884 and 1002885 2013-04-21 13:46:10 +02:00
Eugene Sandulenko
f882374d8a TESTBED: Fix memory leak. CID 1003583 2013-04-21 14:27:30 +03:00
Eugene Sandulenko
095dfcad15 INSANE: Fix potential buffer overflow. CID 1003866 2013-04-21 14:27:30 +03:00
athrxx
71a1c0a27f KYRA: (EOB) - fix bug #3611077 2013-04-21 13:14:39 +02:00
athrxx
5d943f6f67 KYRA: (EOB) - minor cleanup 2013-04-21 13:14:37 +02:00
athrxx
e37a542cfe KYRA: (EOB) - add debugger function (list_monsters) 2013-04-21 13:14:35 +02:00
Eugene Sandulenko
4a17b91db2 AGI: Fix sound deinit. CID 1004128
We really left sound gen leaked with preagi games.
2013-04-21 14:12:13 +03:00
Torbjörn Andersson
8d25c55891 KYRA: Fix MIDI fade-out behaviour
There are two ways that the music volume may be set:

The setSourceVolume() specifies the current music volume, as
ScummVM sees it. This is stored in _sources[].volume.

The MIDI data itself can trigger volume events. These are handled
by send(), which stores the volume - usually (always?) 100 - in
_sources[_curSource].controllers[]. The volume is then adjusted
by _sources[].volume.

When music is faded out, setSourceVolume() is called repeatedly
with progressively smaller values for the volume. What it should
do, then, is to make sure that the volume is set to what was
previously set to in send(), adjusted to the fading volume.

At least, that's how I understand it.
2013-04-21 12:54:19 +02:00
Torbjörn Andersson
5d7067baaa HOPKINS: Silence GCC warning 2013-04-21 10:18:30 +02:00
Strangerke
cb2b375ff0 HOPKINS: Fix missing break in switch CID 1003757 2013-04-21 08:28:23 +02:00
Strangerke
b2d5b40305 HOPKINS: Enlarge _lockedAnims array to avoid potential out of bound access. CID 1004012 2013-04-21 08:25:42 +02:00
Paul Gilbert
4518535968 HOPKINS: Removed spaces after asserts 2013-04-21 01:13:02 -04:00
Strangerke
48c62cbb7d HOPKINS: Fix code related to _zoneLine 2013-04-21 00:40:09 +02:00
Strangerke
f66e702e01 HOPKINS: More MAX_LINES cleanup 2013-04-21 00:28:41 +02:00
Strangerke
b7d4ece827 HOPKINS: Add extra sanity check CID 1004008 2013-04-21 00:26:41 +02:00
Willem Jan Palenstijn
31e08b923c HOPKINS: MAX_LINES cleanup 2013-04-21 00:24:48 +02:00
Einar Johan Trøan Sømåen
b97edfcbe0 WINTERMUTE: Fix the final int->int32 to allow AmigaOS4-compile. 2013-04-21 00:24:02 +02:00
Strangerke
be0f082ab6 HOPKINS: Improve test on lineData in testLine. CID 1003821 2013-04-21 00:00:54 +02:00
Willem Jan Palenstijn
f279cc0e51 SCI: Add extra sanity check 2013-04-20 23:53:06 +02:00
Strangerke
3c94770349 HOPKINS: Fix missing break in characterRoute() CID 1003758 2013-04-20 23:48:34 +02:00
Strangerke
08b1002eb5 HOPKINS: Fix check on index in LinesManager. CID 1004010 2013-04-20 23:41:23 +02:00
Einar Johan Trøan Sømåen
f1c3869669 WINTERMUTE: Fix ScriptExtDate-saving (bump savegame-version to 1.2.1).
This also fixes int->int32 in ScriptExtDate::transfer.
2013-04-20 18:32:42 +02:00
Einar Johan Trøan Sømåen
d8eff7be22 WINTERMUTE: Change ScriptValue to use int32. 2013-04-20 18:18:54 +02:00
Einar Johan Trøan Sømåen
51e17d9f86 WINTERMUTE: Further reduce the amount of int->int32-confusion. 2013-04-20 18:11:47 +02:00
Einar Johan Trøan Sømåen
2625f3931a WINTERMUTE: Fix a few more int->int32's spotted by fuzzie. 2013-04-20 17:37:19 +02:00
Einar Johan Trøan Sømåen
839c16e848 WINTERMUTE: Let TMEMBER_INT take int32, not int. 2013-04-20 17:16:56 +02:00
Einar Johan Trøan Sømåen
2a2264dc61 WINTERMUTE: Use int32 in coll_templ.h 2013-04-20 17:11:09 +02:00
Willem Jan Palenstijn
24b0b6aa43 SCI: Fix memory leak 2013-04-20 16:27:59 +02:00
Willem Jan Palenstijn
9694cbbaaf SCI: Fix resource type range checks 2013-04-20 16:17:49 +02:00
Willem Jan Palenstijn
09fc458f15 SCI: Report sound stream loading errors 2013-04-20 16:13:41 +02:00
johndoe123
4fc57dac8f SWORD25: Fix blitting code
- Rename collectRenderQueue to preRender
- Only do forceRefresh() in Panel::setColor() and Text::setText() if the new values are different
- Move child object resorting from RenderObject::render() into RenderObject::preRender()
2013-04-20 00:34:32 +02:00
Willem Jan Palenstijn
e273a387a7 SCI: Replace workaround for bug #3605269 by script patch 2013-04-19 23:50:04 +02:00
Einar Johan Trøan Sømåen
c5bd3ecb13 WINTERMUTE: Change more int's to int32s. 2013-04-19 18:20:43 +02:00
Einar Johan Trøan Sømåen
9184bb5c24 WINTERMUTE: Add overrides to Font-classes. 2013-04-19 18:15:25 +02:00
Einar Johan Trøan Sømåen
a2fb3dfe9e WINTERMUTE: Replace a few more ints by int32s. 2013-04-19 18:13:42 +02:00
Einar Johan Trøan Sømåen
315550c0f8 WINTERMUTE: Change transfer(int *val) to transfer(int32 *val) 2013-04-19 17:29:34 +02:00
Einar Johan Trøan Sømåen
72d0affe01 WINTERMUTE: Rename transfer(void *) to transferPtr(void *) to avoid overload-misses. 2013-04-19 17:17:53 +02:00
Einar Johan Trøan Sømåen
60a474d452 WINTERMUTE: Initialize member _gameRef in SaveThumbHelper 2013-04-19 17:17:41 +02:00
Johannes Schickel
2785c3a528 Merge pull request #322 from fingolfin/fix-clang-warnings
Fix clang warnings
2013-04-19 06:43:47 -07:00
Alyssa Milburn
80271c24b1 MOHAWK: Try LB subpage 0 if loading subpage 1 fails. 2013-04-19 15:05:53 +02:00
Sven Hesse
4a59c02a8f GOB: Add a call to Inter::animPalette() in the hotspot checker
The original has the call there too, as confirmed using
the disasm of the gob3 binary.

This fixes bug #3611208.
2013-04-19 11:40:18 +02:00
Strangerke
907f650620 HOPKINS: Remove useless endless loop in AnimationManager 2013-04-19 08:16:15 +02:00
Strangerke
cbf85da3f3 HOPKINS: Simplify code in checkSounds() 2013-04-19 08:10:30 +02:00
Strangerke
398b4353a6 HOPKINS: Remove dead code and out of bound access in SoundManager 2013-04-19 08:05:29 +02:00
Strangerke
6de13b475e HOPKINS: Fix missing break in ScriptManager. CID 1003759 2013-04-19 00:51:00 +02:00
Alyssa Milburn
02d81911cd MOHAWK: Add LB function name aliases. 2013-04-19 00:48:41 +02:00
Strangerke
16259a52e3 HOPKINS: Remove dead code in ScriptManager 2013-04-19 00:46:49 +02:00
Alyssa Milburn
aa140c4982 MOHAWK: Fix bug in View::setModule (thanks ST). 2013-04-19 00:46:11 +02:00
Alyssa Milburn
ba9efd5c40 MOHAWK: Allow skipping LB videos, plus other video bits. 2013-04-19 00:42:28 +02:00
Alyssa Milburn
73d6294619 MOHAWK: Some LB bytecode improvements. 2013-04-19 00:36:45 +02:00
Alyssa Milburn
541a0b8c69 MOHAWK: Implement LB's kTokenEval. 2013-04-19 00:32:49 +02:00
Alyssa Milburn
aa1fe8a161 MOHAWK: Implement kLBXDataFileAddSection/SetKey. 2013-04-19 00:25:18 +02:00
Strangerke
d7a4a12b67 HUGO: Initialize variables in Hugo engine constructor. CID 1002886 2013-04-19 00:21:37 +02:00
Strangerke
caa04fb8bf JANITORIAL: Add a CRLF at the end of the file to fix compilation using MSVC (complete previous commit) 2013-04-19 00:02:51 +02:00
Strangerke
69dd65aa93 JANITORIAL: Add a CRLF at the end of the file to fix compilation using MSVC 2013-04-19 00:00:25 +02:00
Max Horn
34aaac0a1e AGI: Silence another clang var
Reading an array without using the resulting value has no effect.
In any case, this code still looks like it may be broken, so somebody
who knows more about AGI should perhaps investigate this closer.
2013-04-18 23:50:21 +02:00
Max Horn
2a10f6a97f WINTERMUTE: Do not us char literals to index an array
This silences a clang warning
2013-04-18 23:50:20 +02:00
Max Horn
055b86ea18 HOPKINS: Replace non-ASCII characters by octal string literals
This silences a clang warning. It seems like a good idea, too: non-ASCII
chars in string constants are prone to break as a result of (possibly
unintentional) encoding conversions (which one can configure git to
perform).
2013-04-18 23:50:20 +02:00
Max Horn
51bde6ced5 SCI: Remove a bunch of unused private member variables
All instances uncovered by clang warnings.
2013-04-18 23:50:20 +02:00
Max Horn
b791edabf7 ENGINES: Remove a bunch of unused private member variables
All instances uncovered by clang warnings.
2013-04-18 23:50:20 +02:00
Max Horn
cdfd5f85c8 ENGINES: Silence clang warning about unused private member _vm
This affects the Console / debugger classes of multiple engines.
An alternative solution would have been to remove the unused _vm
member vars. However, it seems likely that in the future, the _vm
member could be useful for methods added to the console. So instead,
we add a simple assert(_vm) to silence the clang warning.
2013-04-18 23:50:19 +02:00
Max Horn
4fb289e346 AGI: Get rid of unused SoundMgr parameters 2013-04-18 23:50:19 +02:00
athrxx
78ba3210a5 KYRA: (LOL) - fix bug in last commit for scene_lol.cpp 2013-04-18 22:15:25 +02:00
johndoe123
176a3babc5 Merge branch 'master' of github.com:scummvm/scummvm into sword25-gfx 2013-04-18 19:08:22 +02:00
Einar Johan Trøan Sømåen
6c55213cd5 WINTERMUTE: Add 'override' to most Script-related functions. 2013-04-18 18:04:51 +02:00
Einar Johan Trøan Sømåen
b6242d0ea5 WINTERMUTE: Use int32 instead of int in classes. 2013-04-18 17:45:50 +02:00
Max Horn
4a55f52818 SWORD25: Silence warning in the Lua code
This fixes warnings like this that crop up when compiling sword25
with Apple clang 4.2 (clang-425.0.28) (based on LLVM 3.2svn)
2013-04-18 17:09:32 +02:00
athrxx
2b8cb1c1f0 KYRA: (EOB) - silence warning about improper use of negative value in gui_eob.cpp 2013-04-18 16:10:55 +02:00
athrxx
2f6d47059b KYRA: (EOB) - fix possible null ptr dereference in gui_eob.cpp 2013-04-18 16:10:54 +02:00
athrxx
b04059cd23 KYRA: (LOL) - add comment in gui_lol.cpp 2013-04-18 16:10:52 +02:00
athrxx
3d91f3239e KYRA: (LOL) - add assert in items_lol.cpp (should silence warning about possible out of bounds access) 2013-04-18 16:10:51 +02:00
athrxx
3ac156422e KYRA: (LOL) - fix warning about possible out of bounds access in lol.cpp 2013-04-18 16:10:49 +02:00
athrxx
2bdfa47ec0 KYRA: (EOB) - remove unused variable in scene_eob.cpp 2013-04-18 16:10:48 +02:00
athrxx
9b74a7bd65 KYRA: (LOL) - fix possible null ptr dereference in scene_lol.cpp 2013-04-18 16:10:46 +02:00
athrxx
d2d2ed1303 KYRA: (EOB) - remove dead code in screen_eob.cpp 2013-04-18 16:10:45 +02:00
athrxx
5ed0770401 KYRA: (HOF) - fix possible null ptr dereference in sequences_hof.cpp 2013-04-18 16:10:43 +02:00
athrxx
06962db454 KYRA: (HOF) - fix possible out of bounds array access 2013-04-18 16:10:42 +02:00
athrxx
d3419f6a31 KYRA: (EOB) - add assert in sprites_eob.cpp (might fix warning about possible null ptr deref) 2013-04-18 16:10:40 +02:00
athrxx
0a623ecdec KYRA: (EOB) - fix potential null ptr dereference in sprites_eob.cpp 2013-04-18 16:10:39 +02:00
athrxx
2c973a6bff KYRA: (EOB) - fix warning (Logically dead code) in sprites_eob.cpp 2013-04-18 16:10:38 +02:00
athrxx
4021a04269 KYRA: (LOL) - fix warning (Unused pointer value) in sprites_lol.cpp 2013-04-18 16:10:36 +02:00
athrxx
9fdc70de36 KYRA: (LOL) - add comment in sprites_lol.cpp 2013-04-18 16:10:35 +02:00
athrxx
3e9f4943d2 KYRA: (EOB) - add comment in timer_eob.cpp 2013-04-18 16:10:33 +02:00
Willem Jan Palenstijn
e4a9717434 AGI: Fix typo in issetv opcode
This fixes bug #3611262
2013-04-18 14:53:34 +02:00
Einar Johan Trøan Sømåen
a00c372f9e WINTERMUTE: Get Renderer from BaseEngine, not BaseGame in BaseClasses. 2013-04-18 12:31:27 +02:00
Einar Johan Trøan Sømåen
8bcaf3e06c WINTERMUTE: Use BaseEngine for Logging, not _gameRef in base-classes. 2013-04-18 12:24:42 +02:00
Einar Johan Trøan Sømåen
a4f7763579 WINTERMUTE: Avoid including BaseGame in PartEmitter. 2013-04-18 12:17:58 +02:00
Einar Johan Trøan Sømåen
e5b2107704 WINTERMUTE: Avoid including BaseGame in BaseSoundManager. 2013-04-18 12:15:05 +02:00
Einar Johan Trøan Sømåen
32ace5f9d2 WINTERMUTE: Avoid including BaseGame in BaseFader. 2013-04-18 12:13:12 +02:00
Einar Johan Trøan Sømåen
8f25b651e8 WINTERMUTE: Split the timers from BaseGame into a separate class. 2013-04-18 12:10:40 +02:00
Einar Johan Trøan Sømåen
7ee757366b WINTERMUTE: Avoid including BaseGame in BaseViewport. 2013-04-18 11:19:26 +02:00
Einar Johan Trøan Sømåen
a8f4f20f38 WINTERMUTE: Avoid including BaseGame in BaseFrame. 2013-04-18 11:13:32 +02:00
Einar Johan Trøan Sømåen
4783d643f6 WINTERMUTE: Constify AdRotLevel 2013-04-18 10:13:02 +02:00
Einar Johan Trøan Sømåen
d926b47186 WINTERMUTE: Constify AdResponse/AdResponseBox/AdResponseContext. 2013-04-18 10:13:02 +02:00
Strangerke
e4ec07a6a1 CGE: Add safeguards in text manager 2013-04-18 08:10:07 +02:00
Strangerke
0aa028c3f1 CGE: Add safeguard in expand() 2013-04-18 07:57:26 +02:00
Willem Jan Palenstijn
430db6719f SCI: Fix confusing use of strncpy 2013-04-17 23:55:01 +02:00
Willem Jan Palenstijn
b1534913c1 SCI: Remove dead code 2013-04-17 23:49:08 +02:00
Willem Jan Palenstijn
e89c8c1923 SCI: Remove useless delete 2013-04-17 23:43:02 +02:00
Willem Jan Palenstijn
23da164136 SCI: Fix memory leak 2013-04-17 23:34:06 +02:00
Alyssa Milburn
1dc58b0b2a PARALLACTION: Fix BRA amiga inventory item cursors. 2013-04-17 23:20:55 +02:00
Alyssa Milburn
1eefd6301b PARALLACTION: Don't use an invalid array index. 2013-04-17 23:20:31 +02:00
Alyssa Milburn
c9ccba01df PARALLACTION: Add some sanity checks to SoundMan_br::execute. 2013-04-17 23:20:13 +02:00
Alyssa Milburn
a514927381 PARALLACTION: Fix buffer size in unpackBackground. 2013-04-17 23:19:47 +02:00
Alyssa Milburn
98934898cf PARALLACTION: Use strlcpy instead of strncpy. 2013-04-17 23:17:22 +02:00
Einar Johan Trøan Sømåen
9dea64209d WINTERMUTE: Add more const to AdResponseBox 2013-04-17 21:21:17 +02:00
Einar Johan Trøan Sømåen
b71570b4c8 WINTERMUTE: Improve const-usage in VideoTheoraPlayer. 2013-04-17 21:21:17 +02:00
Einar Johan Trøan Sømåen
76d9256679 WINTERMUTE: Protect more members in BaseRenderer. 2013-04-17 21:21:17 +02:00
Einar Johan Trøan Sømåen
3597f7596d WINTERMUTE: Constify _width and _height in BaseRenderer. 2013-04-17 21:21:17 +02:00
Einar Johan Trøan Sømåen
5f5b415289 WINTERMUTE: Increase const-usage. 2013-04-17 21:21:17 +02:00
Einar Johan Trøan Sømåen
7f4b95b3f8 WINTERMUTE: Use only const BaseGame-ref in SaveThumbHelper. 2013-04-17 21:21:17 +02:00
Einar Johan Trøan Sømåen
411b7128ab WINTERMUTE: Rename base_save_thumb_helper.cpp to match class-hierarchy. 2013-04-17 21:21:16 +02:00
Einar Johan Trøan Sømåen
e1bce6377d WINTERMUTE: Detach BaseSaveThumbHelper from inheritance tree. 2013-04-17 21:21:16 +02:00
Willem Jan Palenstijn
ff33c5c367 DREAMWEB: Make location array sizes more consistent
While location 15 doesn't actually exist, this makes roomPics more
consistent with the roomsCanGo array.
2013-04-17 21:14:04 +02:00