Commit Graph

66 Commits

Author SHA1 Message Date
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
Matthew Hoops
4235358fad MOHAWK: Use direct access on the hashmap for Riven variables now 2011-03-23 23:14:59 -04:00
Matthew Hoops
d91c33ca26 MOHAWK: Implement xrwindowsetup 2011-03-22 14:11:24 -04:00
Matthew Hoops
273ba73d5f MOHAWK: Minor cleanup and consistency fixes 2011-03-21 18:33:48 -04:00
Matthew Hoops
6b80d25f6e MOHAWK: Implement the prison viewer 2011-03-21 18:28:02 -04:00
Matthew Hoops
96c7f0d22d MOHAWK: Implement the Ytram trap 2011-03-20 16:13:53 -04:00
Matthew Hoops
0d271324db MOHAWK: Remove outdated TODO 2011-03-09 14:11:28 -05:00
Matthew Hoops
8de370e847 MOHAWK: Correct start times for Riven credits 2011-03-09 14:10:47 -05:00
Matthew Hoops
8743838f47 MOHAWK: Add initial support for the Riven credits sequence
The credits start too early for a few of the end game sequences, but otherwise works well (minus missing fade support, but that is throughout the game anyway).
2011-03-09 13:59:30 -05:00
Matthew Hoops
ad7400524b MOHAWK: Make Riven use original executables for cursors
It will try both Windows and Macintosh executables. The hardcoded cursors have been removed.
2011-03-07 01:10:01 -05:00
Matthew Hoops
e0430e6e9e MOHAWK: Correct the variable used for the lab book in Riven 2011-02-14 10:34:18 -05:00
Max Horn
85aabef6fe VIDEO: Replace Video::VideoTimestamp with Audio::Timestamp
svn-id: r55814
2011-02-07 22:57:35 +00:00
Matthew Hoops
d6a4ff3639 MOHAWK: Recheck the current hotspot if a script has changed the enabled hotspots in Riven
svn-id: r55493
2011-01-24 02:43:07 +00:00
Eugene Sandulenko
caa6684752 VIDEO: Move video classes to Video:: namespace
svn-id: r55479
2011-01-23 19:08:09 +00:00
Matthew Hoops
0761ab7b3a MOHAWK: Rename some VideoManager functions so we have some unified naming between versions
svn-id: r55312
2011-01-18 20:30:16 +00:00
Matthew Hoops
5da1718beb MOHAWK: Implement the whark response to the red light
svn-id: r55300
2011-01-18 14:51:03 +00:00
Matthew Hoops
245b7337f8 MOHAWK: Implement the village part of the left viewer on gspit
svn-id: r55299
2011-01-18 14:26:26 +00:00
Matthew Hoops
2a808be804 MOHAWK: Implement xgrviewer so the right viewer on gspit is usable
svn-id: r55282
2011-01-18 00:42:16 +00:00
Matthew Hoops
3fa01f4030 MOHAWK: Implement the Riven pin controls
svn-id: r55278
2011-01-17 16:10:48 +00:00
Matthew Hoops
0eeacfe43e MOHAWK: Simplify some code
svn-id: r55242
2011-01-14 16:39:34 +00:00
Matthew Hoops
f6b7979277 MOHAWK: Implement Riven's whark number puzzle
svn-id: r55207
2011-01-11 19:44:55 +00:00
Matthew Hoops
1f043e15c7 MOHAWK: Play the telescope moving video (now that seeking is available :))
svn-id: r55205
2011-01-11 17:27:47 +00:00
Alyssa Milburn
32ed3b3582 MOHAWK: Allow background videos to be played/manipulated with resource handles
svn-id: r54843
2010-12-09 21:24:31 +00:00
Matthew Hoops
07ea74d37b MOHAWK: Refactor cursor handling
Cursor handling has now been moved to a new CursorManager class (which is subclassed for Myst/Riven) from the GraphicsManager classes. This will be needed for Living Books which will have a class for Windows and Mac cursors (coming soon!).

svn-id: r54469
2010-11-25 04:49:11 +00:00
Matthew Hoops
90cabfef38 MOHAWK: Find the small marble images by string; should fix German version
svn-id: r54431
2010-11-23 18:29:45 +00:00
Matthew Hoops
9d4827b5e1 MOHAWK: Fix gspit dome from always opening
svn-id: r54417
2010-11-22 17:51:54 +00:00
Matthew Hoops
cc6c7e33bf MOHAWK: Switch slider bitmap ID's to matching via string; fixes some versions
svn-id: r54416
2010-11-22 17:50:30 +00:00
Matthew Hoops
7fb352e38a MOHAWK: Implement an image cache system
This should greatly improve the performance in Myst (especially Myst ME, which uses the slow JPEG decoder). This should also slightly improve the Riven performance; the sliders now work a bit better.

svn-id: r54388
2010-11-19 21:25:36 +00:00
Matthew Hoops
769b460f0d MOHAWK: Implement another Riven demo external
xademoquit() is called from card 12 when clicking anywhere but the system requirements (which is why I hadn't noticed it earlier). I've also stubbed another demo function (xaexittomain()), called from an unused card's script for completeness.

svn-id: r54359
2010-11-19 03:52:06 +00:00
Matthew Hoops
bb5db4aa3b MOHAWK: Finish implementation of the Riven Marble Puzzle
You can now place the marbles and pressing the button will now only set the power to on if the marbles are in the correct positions.

svn-id: r52735
2010-09-15 20:28:42 +00:00
Matthew Hoops
30080c7e07 MOHAWK: Add initial work on the Riven marble puzzle
The marbles are currently drawn, and you can pick them up, but you can not place them on the grid yet.

svn-id: r52661
2010-09-09 17:27:02 +00:00
Matthew Hoops
0cba4f0306 MOHAWK: Implement blocking sound in Riven
Sounds that set the third argument of the playSound opcode to 1 (wherever they may be) will now block. The volume parameter of playSound is also now honored. Merge the Myst sound blocking code with this too.

svn-id: r52643
2010-09-08 20:50:56 +00:00
Matthew Hoops
58139baf37 MOHAWK: Sound cleanup
Merge the Riven sound file code with the main Riven resource code and remove the mainSoundFile parameter from Sound::playSound(). Reasoning: The sound id's do not collide with the sound id's in the main data files. The sound archives only exist because the original CD version had the ability to choose between low and high quality audio.

svn-id: r52631
2010-09-07 20:18:30 +00:00
Matthew Hoops
87a6b631bf MOHAWK: Add stopping sounds to the telescope functions
svn-id: r52628
2010-09-07 19:00:55 +00:00
Matthew Hoops
009889dd13 MOHAWK: Implement xgplateau3160_dopools
The pools of water will now always show the video of returning to the "off" state.

svn-id: r52626
2010-09-07 17:58:10 +00:00
Matthew Hoops
f27a0b2c43 MOHAWK: Fix the boiler puzzle videos
svn-id: r52621
2010-09-07 15:27:06 +00:00
Matthew Hoops
34f570419a MOHAWK: Cleanup
- Split the main Riven event loop into a separate function for readability and for use in the sunner external functions eventually
- Some minor function signature changes (const!)
- Rename matchVarToString() to getVar() (I have no idea where that original name came from, considering it takes a string and returns a variable
- Use solely Common::String in getVar()

svn-id: r52538
2010-09-05 00:48:38 +00:00
Matthew Hoops
8a168f028b MOHAWK: Improve support for the Riven Demo
- The exit button now appears and is functional
- The intro movies now play on start up
- Add shortcuts for returning to the menu/playing the intro videos again
- Make the text when hitting a boundary match the original
- Change the wording of the browser button message
- Note: The demo's extras.mhk (not the full game's!) is required now

svn-id: r52509
2010-09-03 19:13:58 +00:00
Matthew Hoops
a053ef7cd1 MOHAWK: Cleanup mouse cursor position handling in Riven
This fixes some cursors showing up incorrectly if the cursor moved during ie. a video and then the card changes. Also, remove an unneeded rect check in loadHotspots() that's from the ancient times before script size calculation was fixed and some warnings that don't affect gameplay.

svn-id: r52487
2010-09-01 23:22:12 +00:00
Matthew Hoops
649e275ca6 MOHAWK: Implement xbookclick
It is now possible to trap Gehn in the trap book. Side note: Riven is now completable from the beginning provided you know the D'ni number system already (and the marble puzzle is just hacked to always work).

svn-id: r52482
2010-09-01 13:28:12 +00:00
Matthew Hoops
cfbbc3928a MOHAWK: Implement functionality for the dome sliders
The sliders are now movable and reset properly. The combination defined in the lab journal works on all the domes too.

svn-id: r52476
2010-08-31 20:05:00 +00:00
Matthew Hoops
9f5f27b42e MOHAWK: Fix xgwatch in the DVD version, which uses sounds in a different location
svn-id: r52302
2010-08-23 17:01:33 +00:00
Matthew Hoops
8d0b207dd5 MOHAWK: Add initial work for the dome sliders
While the sliders cannot move yet, the game now knows if the puzzle is complete and whether you're over a slider or not. Drawing the sliders and moving the sliders will come next.

svn-id: r52292
2010-08-23 04:14:30 +00:00
Matthew Hoops
5bd2a99717 MOHAWK: Draw in the dome combination in the lab journal
svn-id: r52216
2010-08-19 18:04:11 +00:00
Matthew Hoops
ce9afcfab1 MOHAWK: Draw in the telescope combination in Catherine's journal
svn-id: r52215
2010-08-19 17:33:10 +00:00
Matthew Hoops
e5e90eb8a8 Add a debug console command to Riven for displaying combinations to puzzles.
svn-id: r50338
2010-06-26 19:09:45 +00:00
Matthew Hoops
c2cb3bb799 Add the page turning sound for the Riven journals and stub off the swipe transition used when turning pages.
svn-id: r50336
2010-06-26 18:27:18 +00:00
Matthew Hoops
7c9cbf75c0 Implement the rest of xvalvecontrol for the boiler puzzle in Riven, initialize a variable for the boiler platform switch.
svn-id: r50200
2010-06-24 05:31:07 +00:00