Commit Graph

134 Commits

Author SHA1 Message Date
Ori Avtalion
d90c7a8314 TOON: Avoid hiding overloaded virtual methods 2011-02-27 22:32:50 +02:00
Johannes Schickel
e21d6e0d11 Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master
Conflicts:
	backends/platform/android/android.cpp
	engines/sci/graphics/screen.cpp
	engines/sci/graphics/transitions.cpp
2011-02-19 21:46:45 +01:00
Alyssa Milburn
be7fd9be50 TOON: Initialise all locations.
This stops the location save code from walking off the end of _rifBoxesFlags
due to _numRifBoxes being invalid.
Fix for bug #3183934 ("TOON: Crash on save").
2011-02-17 21:47:27 +01:00
Alyssa Milburn
ec94ef4e64 TOON: Fix TextResource on big-endian.
Fix for bug #3183943 ("TOON: No speech and no text").
2011-02-17 21:15:37 +01:00
Johannes Schickel
a02454644a Merge branch 'master' into osystem-palette
Conflicts:
	backends/platform/wii/osystem_gfx.cpp
2011-02-15 23:42:50 +01:00
eriktorbjorn
7ecab9a982 TOON: Disable quick save/load from the main menu screen.
Saving is pointless and loading doesn't work right. Unless it's
really easy, making quick load work from the main menu is hardly
worth it, since it has a perfectly usable load button already.
2011-02-14 20:44:18 +01:00
Johannes Schickel
42bc90dde0 TOON: Adapt to setPalette RGBA->RGB change. 2011-02-14 17:08:33 +01:00
Torbjörn Andersson
d8d9305c22 TOON: Fix memory leak
PAK files were not being unloaded because closePackage() was being
called with a slightly different file name than than openPackage().

svn-id: r55878
2011-02-11 05:13:37 +00:00
Max Horn
42ab839dd6 AUDIO: Rename sound/ dir to audio/
svn-id: r55850
2011-02-09 01:09:01 +00:00
Max Horn
2d1c8a3533 ALL: Fix whitespaces / indention
svn-id: r55818
2011-02-07 23:01:06 +00:00
Max Horn
41121be4d6 GUI: Rename SaveLoadChooser::runModal to runModalWithPluginAndTarget
This avoids hiding an overloaded virtual method, which in turn can
cause weird bugs (see also the next commit).

svn-id: r55815
2011-02-07 22:58:22 +00:00
Max Horn
ab039812e7 COMMON: OSystem now has a PaletteManager
svn-id: r55806
2011-02-07 17:52:38 +00:00
David Turner
5167cd390c TOON: Added workaround for obvious glitch in first intro video.
This glitch occured in the original interpreter and is probably due an encoding error of 209_1M.SMK.

svn-id: r55798
2011-02-07 02:35:17 +00:00
David Turner
36b6d961c2 TOON: Ensure minimum delay in worst case of render() loop to allow thread scheduling.
This should ensure that CPU usage is not pegged at 100%.

svn-id: r55790
2011-02-05 21:58:44 +00:00
Sylvain Dupont
69a88e315c TOON: Fix formatting issues
svn-id: r55787
2011-02-05 13:12:42 +00:00
Sylvain Dupont
58884b1244 TOON: Add some sleep if the game refreshes too fast
Prevents the game from using 100% CPU? 

svn-id: r55786
2011-02-05 12:11:57 +00:00
Sylvain Dupont
4aaa045017 TOON: Fixed two dialog color mistakes
svn-id: r55777
2011-02-04 23:38:40 +00:00
Sylvain Dupont
ec36d39f25 TOON: Fix Amiga compile
svn-id: r55773
2011-02-04 19:02:40 +00:00
Sylvain Dupont
7ad4241649 TOON: Remove misc/ from paths since it's in global folders
Caps'ed the filenames, even if it should not matter normally

svn-id: r55714
2011-02-01 23:26:54 +00:00
Sylvain Dupont
5257d91e99 TOON: Fixes two movie issues
- Can't skip the videos with left button anymore, now the Nefarius video on the
TV is played normally and not skipped.
- Last video playback 2x too big in height.

svn-id: r55662
2011-01-30 20:21:45 +00:00
Sylvain Dupont
3cd1ac9ca6 TOON: Add coordinates clamping for safety
In some rare cases, Drew position is outside the valid area. 
Made sure it does not crash in these cases.

svn-id: r55655
2011-01-30 13:31:13 +00:00
Sylvain Dupont
5934ccd184 TOON: Fix the last known z-order issues
Rewrote the Z-order management, it's now very close to the original code

svn-id: r55650
2011-01-30 02:18:53 +00:00
Sylvain Dupont
01c32f7287 TOON: More Drew visibility fixes
In the castle, Drew disappeared if you clicked twice on the closed door.

svn-id: r55649
2011-01-30 00:44:51 +00:00
Sylvain Dupont
9c17cedd40 TOON: Bug #3124518 with disappearing inventory items fixed
Bug #3124518: "TOON: loss of inventory items in Bricabrac's machine room"
Was caused by recursive walkTo that were not canceling out.

svn-id: r55641
2011-01-29 23:03:08 +00:00
Sylvain Dupont
c450ac28e9 TOON: Add workarounds in transformed barn scene
Drew does not disappear anymore in the barn when filling his can.
Slowed down the talk animations a bit

svn-id: r55626
2011-01-29 22:15:57 +00:00
Sylvain Dupont
7765c24558 TOON: Fix some palette issues
- In fade out when leaving certain rooms
- When loading a game in a cutaway/closeup state

svn-id: r55625
2011-01-29 20:59:46 +00:00
Sylvain Dupont
96f4cc4b8a TOON: Pathfinding & walking improvements
Use direct line path if possible
Smooth facing direction to avoid flickering (entering zanidu shuttle for example)
Fix possible lockups

svn-id: r55624
2011-01-29 20:12:27 +00:00
Sylvain Dupont
875a840a7a TOON: Fixed crash of bug #3166533
Bug #3166533: "TOON: crashes when leaving room"

svn-id: r55621
2011-01-29 18:42:33 +00:00
Sylvain Dupont
83866978be TOON: Reenable keyboard events
Was disabled when some sticky keyboard flags were activated

svn-id: r55617
2011-01-29 16:19:55 +00:00
Sylvain Dupont
896b87c710 TOON: Bug #3166570 fixed. Magnifier effect when selecting Enigma book
Bug #3166570: "TOON: Wrong mouse-cursor for Item "Book-Enigma"

svn-id: r55616
2011-01-29 16:02:20 +00:00
Filippos Karapetis
5b958eb0d1 TOON: Check for the state of modifier keys (control/alt/shift) when handling game hotkeys
Fixes bug #3166522 at engine level (fix 2/2)

svn-id: r55568
2011-01-27 14:20:16 +00:00
Eugene Sandulenko
caa6684752 VIDEO: Move video classes to Video:: namespace
svn-id: r55479
2011-01-23 19:08:09 +00:00
Eugene Sandulenko
806ccf5d25 GRAPHICS: Move graphics/video/ to video/. Step 1/2
svn-id: r55473
2011-01-23 17:14:43 +00:00
David Turner
243fe811ef TOON: Fix Further Memory Leaks in Savegame Loading.
svn-id: r55408
2011-01-22 05:21:51 +00:00
David Turner
39de104c5c TOON: Fix Uninitialized Memory Read During Cursor Animation on Load.
This was mainly due to _mouseX, which along with the associated variables was not defined until the first mouse event. This was detected by Valgrind.

svn-id: r55402
2011-01-22 01:07:14 +00:00
David Turner
e8e6df9106 TOON: Fix for Memory Leak during Savegame Loading.
svn-id: r55401
2011-01-22 00:00:30 +00:00
David Turner
cb7eb365ae TOON: Fix Memory Leak when opening Inventory.
svn-id: r55400
2011-01-21 23:43:02 +00:00
Sylvain Dupont
f9422fb726 TOON: Bug #3153351 fixed with disappearing Drew
Bug #3153351: "TOON: Drew vanishes when fixing churnatron"
Made sure the scale is never zero.

svn-id: r55399
2011-01-21 23:24:17 +00:00
Sylvain Dupont
8cacde95e7 TOON: Always reset video playback to lowRes when loading new movie
svn-id: r55398
2011-01-21 22:56:22 +00:00
Sylvain Dupont
5469aa1687 TOON: Fix double declaration warning
Thanks to clone2727 ;)

svn-id: r55396
2011-01-21 22:04:41 +00:00
Sylvain Dupont
d5cb146f4c TOON: Fix all the glitches in smacker video playback
Handle manually 2x scaling when it is needed now.

svn-id: r55393
2011-01-21 20:26:25 +00:00
Arnaud Boutonné
4a94eba80a TOON: Add mapping for upper 'ç' and for plenking, both used in french version
svn-id: r55057
2010-12-28 21:19:31 +00:00
Sylvain Dupont
ab01c8e5fc TOON: Fixed memory corruption in several rooms
Some mask line drawings were writing outside the buffer.

svn-id: r55055
2010-12-28 13:13:55 +00:00
Sylvain Dupont
bccf4606c9 TOON: Removed useless confusing code in conversation process part
svn-id: r55054
2010-12-28 13:11:17 +00:00
Sylvain Dupont
1b8678d5de TOON: Path finding bug fixes
Allows Flux to walk close to Drew if really needed to prevent total path block.
Prevents path finding if the character is out of the screen

svn-id: r55051
2010-12-27 21:56:52 +00:00
Sylvain Dupont
f9409fc7d5 TOON: Fixed Bug #3124527 with Dungeon freeze
Bug #3089974: "TOON: Game freezes in act 2 when thrown to the prison"

Wrong pointer increment in conversation process code.

svn-id: r55047
2010-12-26 20:14:04 +00:00
Sylvain Dupont
63e58baae1 TOON: Fix problem when exiting the king cave
svn-id: r55042
2010-12-26 14:32:38 +00:00
Matthew Hoops
375f32fbe9 VIDEO: Make VideoDecoder::decodeNextFrame() return a const Surface pointer
svn-id: r54927
2010-12-16 01:35:13 +00:00
Max Horn
6edc86a19b DEBUG: Let GUI::Debugger::preEnter and postEnter (un)pause the engine
svn-id: r54815
2010-12-07 18:54:21 +00:00
Torbjörn Andersson
6b8a3dba70 TOON: Attempt to fix crash when Bricabrac puts on his glasses
This was a regression in r54223, and it's the most direct fix I can
think of. The problem seems to be that sys_Cmd_Remove_Scene_Anim()
clears the character's _animationInstance while character::playAnim()
is waiting "for the character to be ready".

My fix was to treat _animationInstance NULL as another sign that the
wait is over, but maybe the real fix is for sys_Cmd_Remove_Scene_Anim()
to do more than just clear the variable, e.g. stop the script or
something like that?

svn-id: r54549
2010-11-28 20:53:57 +00:00