Commit Graph

675 Commits

Author SHA1 Message Date
Stuart George
6cf80bbe86 Fixes Mickey and Gold rush. Not the cleanest fix but tested and works
svn-id: r29658
2007-11-28 23:42:08 +00:00
Max Horn
a556368c99 Update mouse coordinates onn *all* mouse events, i.e. also after click events
svn-id: r29657
2007-11-28 15:00:41 +00:00
Stuart George
44ac9cb7ae Fix regression from r28850 that rewrote all pattern data. Fixes agi v3 circle plot patterns
svn-id: r29653
2007-11-28 01:11:09 +00:00
Eugene Sandulenko
9e65796914 Switch AGI to common drawLine() as well
svn-id: r29636
2007-11-25 12:03:09 +00:00
Filippos Karapetis
01f32b60b0 Removed some unnecessary code which was common for two cases
svn-id: r29622
2007-11-24 00:47:29 +00:00
Filippos Karapetis
e9c0276072 Minimized screen updates for Mickey's Space Adventure, and correctly set the hint for Uranus
svn-id: r29619
2007-11-23 18:28:40 +00:00
Max Horn
402a3dbbe3 cleanup
svn-id: r29617
2007-11-23 10:51:16 +00:00
Filippos Karapetis
cd3f548407 Objects in Mickey's Space Adventure are shown correctly now
svn-id: r29612
2007-11-22 20:54:46 +00:00
Max Horn
207ecdb332 Change the AGI image stack to use Common::Stack
svn-id: r29608
2007-11-22 10:32:36 +00:00
Max Horn
982a2fce75 Refactore the AGI floodfill code
svn-id: r29600
2007-11-22 08:20:28 +00:00
Filippos Karapetis
634595e073 Cleanup
svn-id: r29592
2007-11-21 16:55:24 +00:00
Johannes Schickel
b39ee7ec3c Fixed usage of Common::Stack.
svn-id: r29591
2007-11-21 00:41:51 +00:00
Filippos Karapetis
f05712548e Oops, Common::Stack should be used instead of Common::FixedStack
svn-id: r29590
2007-11-21 00:39:12 +00:00
Filippos Karapetis
e069ce6129 Common::FixedStack is used now for AGI flood fill routines
svn-id: r29589
2007-11-21 00:34:32 +00:00
Filippos Karapetis
e17acaa1c6 Fix regression with the menus
svn-id: r29588
2007-11-20 23:42:45 +00:00
Filippos Karapetis
3cb597a046 Cleanup and simplification
svn-id: r29585
2007-11-20 20:25:37 +00:00
Sven Hesse
045d5f5c08 Muting the compiler :P
svn-id: r29581
2007-11-20 19:15:11 +00:00
Filippos Karapetis
338f8aa99e Slight fix for the sound in Mickey's Space Adventure
svn-id: r29579
2007-11-20 16:44:16 +00:00
Filippos Karapetis
ea569b48d0 Implemented music in Mickey's Space Adventure, thanks to the now common softsynth square wave generator
svn-id: r29575
2007-11-20 00:26:36 +00:00
Filippos Karapetis
e010c59277 Oops, made _speakerStream private again
svn-id: r29574
2007-11-19 22:47:58 +00:00
Filippos Karapetis
2d3316a570 _speakerStream should be public. Also, when preAGI engine closes, the speaker handle is freed
svn-id: r29573
2007-11-19 22:37:52 +00:00
Eugene Sandulenko
7270c8113e oops. that's what last minute moves may result in.
svn-id: r29570
2007-11-19 20:41:13 +00:00
Eugene Sandulenko
8a145bbb53 Hook PC Speaker to Troll's Tale. Though pitch and duration are wrong
svn-id: r29569
2007-11-19 20:34:26 +00:00
Eugene Sandulenko
c640d1c604 Patch #1825276: "DETECTION: advanced detector engine simplification"
svn-id: r29386
2007-11-03 21:06:58 +00:00
Filippos Karapetis
39da7deefb Fix for bug #1751483 - "AGI: The -x command-line option appears to be broken"
svn-id: r29346
2007-10-31 21:28:33 +00:00
Kari Salminen
b4f23c84f5 Added a FIXME-comment and a warning to the unknown test command 19.
svn-id: r29336
2007-10-31 08:56:32 +00:00
Kari Salminen
ff55553c72 Fix for bug #1745950 (GR: Birds stuck in opening screen (Amiga version)).
svn-id: r29335
2007-10-31 03:14:12 +00:00
Sven Hesse
a84c9504e9 Fixing compilation
svn-id: r29216
2007-10-13 23:51:08 +00:00
Filippos Karapetis
a08b6606a6 Add a debug console in Winnie (patch by clone2727)
svn-id: r29215
2007-10-13 23:48:59 +00:00
Matthew Hoops
d5f83fbcde objects now work in Winnie C64
svn-id: r29095
2007-09-24 23:28:23 +00:00
Matthew Hoops
5788598f10 allow Winnie Apple II to start up, however room images are slightly distorted and the intro is not shown; other cleanup
svn-id: r29090
2007-09-24 19:37:57 +00:00
Matthew Hoops
e1213945d6 fix regression in the inventory from r28995
svn-id: r29084
2007-09-24 01:46:42 +00:00
Matthew Hoops
e37049cd2f ok, really get rid of "object 41" now -- didn't realize that the rnd function in preagi already adds 1... (DrMcCoy: I guess there was an object 42 before as well)
svn-id: r29083
2007-09-24 01:27:22 +00:00
Eugene Sandulenko
7da28f6129 Rename class variables to conform our coding guidelines.
svn-id: r29059
2007-09-23 17:00:35 +00:00
Eugene Sandulenko
173eb059db Rename class variables to conform our code conventions
svn-id: r29058
2007-09-23 16:52:53 +00:00
Eugene Sandulenko
38d8105e4e Add support for Russian versions of AGI games
svn-id: r29056
2007-09-23 16:43:43 +00:00
Filippos Karapetis
4a8dc7aa68 Cleanup. Also, changed isBigEndian to be a boolean
svn-id: r29054
2007-09-23 16:32:03 +00:00
Eugene Sandulenko
c4ad96b91e Add Tigger and Mist events implementation
svn-id: r29052
2007-09-23 15:09:48 +00:00
Matthew Hoops
35a3f9c9ac objects now work in Winnie Amiga
svn-id: r29051
2007-09-23 13:47:50 +00:00
Eugene Sandulenko
9d26f30929 Fix regression
svn-id: r29050
2007-09-23 13:40:28 +00:00
Matthew Hoops
4e0913b19f changes for Winnie Amiga (now playable) and C64
svn-id: r29049
2007-09-23 12:31:21 +00:00
Eugene Sandulenko
fe2f83efce More endianness and alignment fixes
svn-id: r29048
2007-09-23 12:25:44 +00:00
Eugene Sandulenko
67d728a258 Make readRoom() truly alignment- and endian-safe
svn-id: r29046
2007-09-23 12:02:34 +00:00
Eugene Sandulenko
f260e47512 Portability fix
svn-id: r29045
2007-09-23 11:54:26 +00:00
Filippos Karapetis
d82fa2a65b Fixed some platform checks
svn-id: r29044
2007-09-23 11:20:44 +00:00
Matthew Hoops
352566ee64 allow Winnie C64 to start, although there are problems with the images (probably wrong offset) and logo.pic/intro.pic are not working, so the intro is skipped
svn-id: r29037
2007-09-23 02:15:48 +00:00
Matthew Hoops
f45cf700d8 randomize() can no longer create "object 41" -- there is no object 41, and when we attempt to draw it, it can cause crashes
svn-id: r29036
2007-09-23 00:27:36 +00:00
Matthew Hoops
110da1b1cf readRoom is now Endian-safe
svn-id: r29035
2007-09-23 00:12:07 +00:00
Filippos Karapetis
cee2a60569 Make sure that picture fill doesn't go out of the picture's bounds, since pre-AGI pictures have different dimensions
svn-id: r29034
2007-09-22 23:56:08 +00:00
Matthew Hoops
62f69cff8a fix possible Endian issue
svn-id: r29033
2007-09-22 23:39:47 +00:00
Matthew Hoops
998d43df30 allow Winnie Amiga to show room images, still not playable
svn-id: r29032
2007-09-22 23:36:00 +00:00
Eugene Sandulenko
04feab1689 Switch Troll's Tale to booter image
svn-id: r29028
2007-09-22 20:19:55 +00:00
Matthew Hoops
b4ed831666 some cleanup involving Winnie Amiga, however it still only shows the intro
svn-id: r29027
2007-09-22 20:16:24 +00:00
Matthew Hoops
f371e98f98 allow Winnie Amiga to show the intro
svn-id: r29023
2007-09-22 17:56:23 +00:00
Filippos Karapetis
63f4e23ffa Code cleanup and simplification
svn-id: r29022
2007-09-22 13:27:10 +00:00
Filippos Karapetis
2f412c17e0 Code simplification
svn-id: r29020
2007-09-22 11:31:46 +00:00
Filippos Karapetis
dfb6080e1a Simplified item handling code in Mickey
svn-id: r29019
2007-09-22 10:53:53 +00:00
Filippos Karapetis
00298204e7 Replaced room indexes with their corresponding enums
svn-id: r29018
2007-09-22 10:36:20 +00:00
Filippos Karapetis
366b65486f Code simplification. Removed IDI_MSA_MAX_STR and fRmTxt - oRmTxt is used instead, as the two arrays contained non-null values for the same rooms. Also, room object indices are no longer read from the original executable
svn-id: r29016
2007-09-22 10:10:01 +00:00
Filippos Karapetis
47b8dbbf52 Fix regression caused by the latest cleanups
svn-id: r29011
2007-09-21 20:19:12 +00:00
Filippos Karapetis
e35221f4ca Oops
svn-id: r29010
2007-09-21 20:08:42 +00:00
Filippos Karapetis
8663e5a39f Cleanup
svn-id: r29009
2007-09-21 20:06:57 +00:00
Filippos Karapetis
2310d1f62a Simplified Mickey::randomize()
svn-id: r29008
2007-09-21 19:35:26 +00:00
Filippos Karapetis
dc4c06e954 Several bug fixes for Mickey's Space Adventure:
- Fixed a logic bug, where it was possible that the planets were not initialized properly when flipping XL30's switch without holding any crystal. Note that this breaks older Mickey saved games
- Fixed a bug with the initialization of the planet data, where the random number assigned to each planet could go out of logical bounds
- Save games are saved with the correct extension now (e.g. mickey.s01 instead of mickey.s 1)
- Some save game messages which were not shown are shown now
- Disabled two problematic objects (the scale in Mickey's house and the rock in Jupiter) so they are not shown for now, as our current picture showing algorithm crashes when trying to display them

svn-id: r29007
2007-09-21 19:12:53 +00:00
Filippos Karapetis
7212d00454 Removed an unnecessary picture update when drawing crystal objects in Mickey
svn-id: r29004
2007-09-21 08:55:26 +00:00
Filippos Karapetis
381fba98c5 The animation of the crystals in Mickey is shown correctly now
svn-id: r29003
2007-09-21 08:41:27 +00:00
Filippos Karapetis
d042f82a8a Minimize changes to the mouse cursor's palette
svn-id: r29002
2007-09-21 07:54:43 +00:00
Matthew Hoops
4436433cf6 allow for using up/down in menus
svn-id: r28996
2007-09-20 22:44:48 +00:00
Matthew Hoops
3d4f10a302 cleanup with updating the screen; mostly moved to gameLoop
svn-id: r28995
2007-09-20 22:15:09 +00:00
Matthew Hoops
b07d3419d7 add stub for playSound in Winnie
svn-id: r28994
2007-09-20 22:05:37 +00:00
Matthew Hoops
9ae47673e0 cleanup to readObj and readRoom
svn-id: r28993
2007-09-20 21:55:37 +00:00
Eugene Sandulenko
341b8f1e67 Last pieces of Troll's Tale. Only missing thing is sound
svn-id: r28992
2007-09-20 21:55:15 +00:00
Eugene Sandulenko
14b89bcf46 Implement inventory in Troll's Tale
svn-id: r28987
2007-09-20 18:18:10 +00:00
Filippos Karapetis
0fc3ee26f9 Some updates to Mickey's BCG logo drawing function
svn-id: r28977
2007-09-20 01:38:07 +00:00
Matthew Hoops
f5511b3102 some cleanup using malloc and with readObj
svn-id: r28975
2007-09-19 22:29:14 +00:00
Matthew Hoops
fb97e09e93 show the cursor in Troll after the first intro screen
svn-id: r28974
2007-09-19 21:24:27 +00:00
Eugene Sandulenko
77eea722af Modified patch #1738058: "Action recorder".
svn-id: r28968
2007-09-19 13:55:05 +00:00
Eugene Sandulenko
2254028365 Merge several choice-related functions
svn-id: r28967
2007-09-19 09:54:42 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Filippos Karapetis
a89694c0d6 Moved some keyboard code from Winnie together with the other keyboard functions
svn-id: r28965
2007-09-19 08:27:32 +00:00
Filippos Karapetis
85b1bc594d Don't free the picture buffer inside decodePicture(). The buffer should (and is) freed from the functions that decodePicture() is being called from
svn-id: r28964
2007-09-19 08:21:42 +00:00
Eugene Sandulenko
a8751e4d73 Fix picture drawing in Troll's Tale. Implement room navigation.
svn-id: r28946
2007-09-18 20:23:06 +00:00
Max Horn
3abc11611e Code formatting fixes
svn-id: r28945
2007-09-18 20:16:33 +00:00
Max Horn
c3d3aebe87 Patch #1768757: Merge fsnode-gsoc into trunk (MAJOR change, will break compilation on some ports)
svn-id: r28944
2007-09-18 20:02:04 +00:00
Max Horn
5c08cb1bcf Fix compiler warning
svn-id: r28943
2007-09-18 19:33:05 +00:00
Eugene Sandulenko
55b19a1fd4 First room is shown.
svn-id: r28942
2007-09-18 19:06:05 +00:00
Eugene Sandulenko
34ceaf208f Fix menu and tutorial it Troll's Tale
svn-id: r28941
2007-09-18 17:01:45 +00:00
Eugene Sandulenko
13a73a70b6 WIP for Troll's Tale
svn-id: r28939
2007-09-18 16:20:44 +00:00
Matthew Hoops
8158f3f353 cleanup the intro of Winnie
svn-id: r28896
2007-09-12 22:17:08 +00:00
Matthew Hoops
f4414ac084 remove the rest of the PreAGI loader
svn-id: r28895
2007-09-11 21:39:16 +00:00
Matthew Hoops
be013e6c45 fix regression: free the picture data after decoding a PreAGI picture
svn-id: r28894
2007-09-11 20:17:36 +00:00
Matthew Hoops
c1c7b5f563 PreAGI does not need an AGI resource loader, as it only needs to load pictures and doesn't use directories. So, this allows Winnie to decode pictures without using the loader
svn-id: r28893
2007-09-11 20:09:39 +00:00
Eugene Sandulenko
35d6862117 Remove/clarify several FIXMEs
svn-id: r28892
2007-09-11 15:49:19 +00:00
Max Horn
4cc9d17c34 Adding various FIXME comments to bogus (non-self-explanatory) existing FIXME comments; and some other related cleanup
svn-id: r28890
2007-09-11 09:20:39 +00:00
Max Horn
a8767a421d Fix compilation / warnings
svn-id: r28885
2007-09-10 13:15:40 +00:00
Filippos Karapetis
2b643875ae Some updates for the BCG Disney logo in Mickey
svn-id: r28884
2007-09-09 23:14:29 +00:00
Filippos Karapetis
a86ad9688a It's now possible to move around in Winnie using the mouse, by clicking on the appropriate direction (north, south, east or west)
svn-id: r28883
2007-09-09 23:13:35 +00:00
Filippos Karapetis
c5989f098d Mouse is working now in Winnie. Click to move functionality still not completed, though
svn-id: r28882
2007-09-09 15:33:00 +00:00
Filippos Karapetis
25cea17c0b Silence some MSVC8 warnings
svn-id: r28881
2007-09-09 15:28:26 +00:00
Max Horn
127900b33c Fixed various warnings
svn-id: r28879
2007-09-08 11:17:13 +00:00
Matthew Hoops
89bbbe53ac wind and owl's help works in Winnie
svn-id: r28876
2007-09-07 20:47:31 +00:00
Matthew Hoops
a3422785c1 saving and loading games now works in Winnie
svn-id: r28875
2007-09-07 20:30:10 +00:00
Matthew Hoops
50c05eab6d objects now work in Winnie
svn-id: r28874
2007-09-07 20:09:00 +00:00
Filippos Karapetis
ff52e39620 Some updates on the mouse cursor in Winnie: the mouse cursor is shown now, and it changes when it hovers over the screen edges, but mouse clicking is still not functioning correctly
svn-id: r28873
2007-09-07 16:22:31 +00:00
Matthew Hoops
ae0ff88bda enable inventory in Winnie
svn-id: r28872
2007-09-06 23:45:32 +00:00
Matthew Hoops
4a467ee492 This fixes images in Winnie (for me at least)
svn-id: r28871
2007-09-06 23:32:08 +00:00
Filippos Karapetis
9db43997f7 Temporary workaround for crashes occurring in Winnie when a room's picture resource is unloaded
svn-id: r28870
2007-09-06 22:13:33 +00:00
Filippos Karapetis
6964db4592 Some updates for decoding Disney's BCG logo in Mickey
svn-id: r28869
2007-09-06 21:58:57 +00:00
Matthew Hoops
843c35f3a4 room strings now work in Winnie
svn-id: r28868
2007-09-06 21:48:33 +00:00
Matthew Hoops
898043d967 Winnie now enters the main loop and allows for movement (via the menu)
svn-id: r28867
2007-09-06 20:51:40 +00:00
Matthew Hoops
cea837ef7d WIP Winnie the Pooh code (PreAGI). Shows only the intro currently
svn-id: r28865
2007-09-06 10:48:00 +00:00
Filippos Karapetis
2d974a22d4 Objects in Mickey are shown correctly now. Also, reduced the places where the screen gets updated
svn-id: r28862
2007-09-06 01:18:13 +00:00
Filippos Karapetis
1aa4e0e8d0 Changed several #ifdef _DEBUG code parts in Mickey with #if 0 (and commented them as debug). For some reason, _DEBUG seems to be set, causing all those code parts to be ran (which lead to all sorts of unexpected behavior)
svn-id: r28861
2007-09-05 22:38:08 +00:00
Filippos Karapetis
8ccd247a74 Only change the cursor palette when the mouse hovers over a hotspot in Mickey, not the whole cursor. This is a much faster operation, which also gives better results
svn-id: r28860
2007-09-05 21:57:57 +00:00
Matthew Hoops
94a96881ae clear the screen after using printStory() so the text does not remain on in the background
svn-id: r28857
2007-09-05 19:47:32 +00:00
Eugene Sandulenko
677947ed39 Make blinking lights work
svn-id: r28856
2007-09-05 19:36:13 +00:00
Eugene Sandulenko
c5d18bf020 Move static variables to class.
svn-id: r28855
2007-09-05 19:35:30 +00:00
Filippos Karapetis
5a97b3d9be Some updates for Mickey:
- Click to move functionality (improvement over the original game). It's now possible to navigate around using the mouse as well, together with the menu commands. The mouse cursor changes when the player hovers it at the picture's edges, towards a direction where Mickey is able to move to (north, south, east or west)
- waitAnyKey has been moved into Mickey's code (because of the animation part)
- Implemented the circle flag for AGI picture decoding

svn-id: r28853
2007-09-05 15:43:56 +00:00
Eugene Sandulenko
0d279e8de0 - Replace plotPattern() function with one based on specs.
- Add PreAGI differences to plotPattern function.
- This effectively fixes Mickey title.

svn-id: r28850
2007-09-04 11:20:42 +00:00
Filippos Karapetis
7389396a7f The mouse cursor is now visible in Mickey. Also, the enter key on the keypad works now. Some cleanup
svn-id: r28849
2007-09-04 06:54:40 +00:00
Filippos Karapetis
b555a15697 Some updates for Mickey: objects are shown now (though still incorrectly), implemented some incomplete code for the ship's blinking lights, implemented the scene animation function
svn-id: r28848
2007-09-03 15:03:50 +00:00
Max Horn
750ad32030 Fix warning about unused static function
svn-id: r28847
2007-09-03 12:23:50 +00:00
Max Horn
3c2994f72b Make static data tables const (helps the optimizer a bit)
svn-id: r28846
2007-09-03 12:23:19 +00:00
Filippos Karapetis
5e1a10c070 Some more updates to Mickey's sound system
svn-id: r28845
2007-09-03 10:25:48 +00:00
Filippos Karapetis
51554b6f20 Some updates to preagi's sound system and code cleanup
svn-id: r28844
2007-09-03 09:39:15 +00:00
Matthew Hoops
5a5e994e4f make Mickey use the SaveFileManager for saving/loading
svn-id: r28843
2007-09-03 01:55:56 +00:00
Filippos Karapetis
30c479a7e4 Cleanup
svn-id: r28842
2007-09-03 01:49:24 +00:00
Matthew Hoops
d2d8ab7d18 fix warning
svn-id: r28841
2007-09-03 01:36:55 +00:00
Filippos Karapetis
7faa389525 Some updates to Mickey's sound system and code cleanup
svn-id: r28840
2007-09-03 01:33:17 +00:00
Matthew Hoops
339e9cf173 fix flashScreen
svn-id: r28839
2007-09-03 01:29:10 +00:00
Filippos Karapetis
39de6091e2 Implemented clearRow for preagi games. Mickey save games should work now. Some code cleanup
svn-id: r28838
2007-09-03 00:47:51 +00:00
Filippos Karapetis
314d7c1736 Implemented clearScreen() for preagi games
svn-id: r28837
2007-09-02 23:25:39 +00:00
Filippos Karapetis
2dd4f61b5e Text in Mickey is shown correctly now. Also, removed an obsolete function declaration of PutPixel()
svn-id: r28835
2007-09-02 22:47:53 +00:00
Filippos Karapetis
f075661221 Image placement in Mickey is correct now
svn-id: r28834
2007-09-02 22:45:02 +00:00
Filippos Karapetis
cb2ce51236 Renamed preagi_input.cpp to preagi_common.cpp, as it now contains the code that all preagi games share (commit 2 of 2)
svn-id: r28832
2007-09-02 21:36:43 +00:00
Filippos Karapetis
f50bdd1aa8 Moved preagi common code to a more appropriate place (commit 1 of 2)
svn-id: r28831
2007-09-02 21:31:51 +00:00
Filippos Karapetis
7909ce3986 Removed rand() and substituted it with Common::RandomSource
svn-id: r28825
2007-09-02 15:19:20 +00:00
Matthew Hoops
957e421bfa fix more warnings
svn-id: r28822
2007-09-02 13:50:26 +00:00
Filippos Karapetis
7c92d3b02b Slight update on Mickey's drawPic
svn-id: r28821
2007-09-02 13:44:37 +00:00
Matthew Hoops
f3ae0182e0 fix a warning and some code formatting
svn-id: r28820
2007-09-02 13:44:23 +00:00
Filippos Karapetis
b4d77e60cf The dimensions of the picture resources in preagi games is different for each game. Mickey's pictures are shown correctly now
svn-id: r28819
2007-09-02 13:23:07 +00:00
Filippos Karapetis
762aaca73b The picture files in Mickey have a different width
svn-id: r28818
2007-09-02 12:56:55 +00:00
Travis Howell
ae007b49e0 Fix compile.
svn-id: r28814
2007-09-02 02:37:18 +00:00
Filippos Karapetis
afac94340a Some more updates to preagi string drawing function
svn-id: r28813
2007-09-02 02:25:13 +00:00
Filippos Karapetis
2182d758d0 Initial implementation of preagi string drawing functions. They still need work, though
svn-id: r28812
2007-09-02 01:45:59 +00:00
Filippos Karapetis
38c21d6539 Merged all the different picture decoding functions
svn-id: r28811
2007-09-02 00:49:03 +00:00
Filippos Karapetis
1a85c98598 Implemented the rnd() function. Some cleanup to remove unneeded functionality
svn-id: r28810
2007-09-01 23:30:37 +00:00
Eugene Sandulenko
fae7dcadbd Fix regression
svn-id: r28809
2007-09-01 23:02:36 +00:00
Eugene Sandulenko
41e72bfaaf Fix fallback detector
svn-id: r28808
2007-09-01 21:22:26 +00:00
Eugene Sandulenko
19fde8da20 Fix compilation and warnings.
svn-id: r28801
2007-09-01 19:03:22 +00:00
Filippos Karapetis
9db1525e50 Added WIP logic code for Mickey's Space Adventure
svn-id: r28800
2007-09-01 18:46:55 +00:00
Eugene Sandulenko
554cff0384 GIve some files more logical names
svn-id: r28791
2007-09-01 17:28:15 +00:00
Eugene Sandulenko
7f08865ec5 An early WIP of PreAGI (TrollVM) support
svn-id: r28787
2007-09-01 14:58:46 +00:00
Eugene Sandulenko
ce71254b9f Add older picture formats parsers
svn-id: r28784
2007-09-01 11:39:51 +00:00
Kari Salminen
a4780a8f82 Fix relative pitch handling (It's signed, was interpreted as unsigned before).
svn-id: r28759
2007-08-28 10:41:25 +00:00
Kari Salminen
c2c9ab9a22 An encountered zero in an Apple IIGS sample stream turns off looping for that stream. Implemented this.
svn-id: r28688
2007-08-21 15:51:28 +00:00
Kari Salminen
55896e7584 Added note of clarification on enum AgiSoundType's different values.
svn-id: r28684
2007-08-21 09:12:00 +00:00
Kari Salminen
ef0bd468a2 Made Apple IIGS MIDI file parsing work (They aren't completely standard MIDI files). Enables playing the MIDI files (No sound! Only stepping through). Speed's probably not correct.
svn-id: r28674
2007-08-19 23:57:12 +00:00
Kari Salminen
42e257b08d Removed superfluous variable checkings. Made it so that Apple IIGS mixing code doesn't try to mix MIDI sounds yet as mixing them isn't yet supported.
svn-id: r28673
2007-08-19 23:33:22 +00:00
Kari Salminen
72fd923cf5 Fixes previously crashing sound. Crash happened because of PCjr 4-channel mixing code trying to use uninitialized values (phase, ins etc) when mixSound was called before anything was playing.
svn-id: r28672
2007-08-19 23:28:38 +00:00
Max Horn
5b711795d0 Some cleanup / const correctness / OOfication
svn-id: r28671
2007-08-19 20:48:11 +00:00
Max Horn
df9414c9a1 Fixed warning about global symbol 'chn' being shadowed by local declaration 'chn' (note: naming a global var 'chn' is probably a bad idea. And using a class would be far better anyway ;)
svn-id: r28669
2007-08-19 20:31:15 +00:00
Kari Salminen
a777b3e64f Changed Apple IIGS sample playing frequency multiplier from 1076.0 to C6 (i.e. about 1046.5). Commented out a warning that comes too often.
svn-id: r28657
2007-08-18 15:54:29 +00:00
Kari Salminen
d862dc430d Added support for playing Apple IIGS samples. The code's not very pretty at the moment (Work in progress). Apple IIGS MIDI sound probably broken somehow at the moment.
svn-id: r28656
2007-08-18 12:41:24 +00:00
Kari Salminen
aa8db3f74f Added a definition for Apple IIGS sound emulation mode, made sound initialization set it when appropriate and instruments loading use it.
svn-id: r28647
2007-08-17 13:10:57 +00:00
Max Horn
47b2f533f0 Fixed some warning
svn-id: r28638
2007-08-16 18:42:28 +00:00
Kari Salminen
c987d6aaf0 Added rudimentary classes for different AGI sound resources (IIgsMidi, IIgsSample, PCjrSound). Made existing code to at least work with PCjrSound.
svn-id: r28630
2007-08-15 22:00:31 +00:00
Kari Salminen
b99153050a Moved AgiSound definition around and also changed it from a struct to a class.
svn-id: r28629
2007-08-15 18:37:52 +00:00
Kari Salminen
ec3f37956d Removed unneeded code from inside #if 0 ... #endif -clauses.
svn-id: r28628
2007-08-15 16:46:37 +00:00
Kari Salminen
fa9a6cef84 Removed use of decodeSound(int resnum). Not needed at the moment (Probably going to be replaced by other functionality later).
svn-id: r28627
2007-08-15 16:44:13 +00:00
Kari Salminen
fe9bb43622 Removed use of USE_IIGS_SOUND (#define).
svn-id: r28626
2007-08-15 16:40:45 +00:00
Kari Salminen
d4998087aa Changed use of USE_CHORUS (#define) to g_useChorus (static boolean).
svn-id: r28625
2007-08-15 16:31:15 +00:00
Kari Salminen
4d83eef351 Made AGI's 4-channel PCjr sound not need structure packing pragmas anymore. Also added more use of little endian reading macros.
svn-id: r28624
2007-08-15 15:55:38 +00:00
Kari Salminen
e888aa1217 Shuffled around AgiGameID's declaration and an include to get stuff hopefully working now with GCC too.
svn-id: r28616
2007-08-14 13:36:03 +00:00
Kari Salminen
f55c8407b0 Added forward declaration for enum AgiGameID (Was breaking compilation on GCC).
svn-id: r28615
2007-08-14 13:12:06 +00:00
Kari Salminen
8a8b97c230 Moved Apple IIGS related structs' read & finalize functions' implementations to sound.cpp and left the declarations in sound.h.
svn-id: r28614
2007-08-14 12:54:57 +00:00
Kari Salminen
af85709cfd Defined some functions in Agi::SoundMgr and moved stuff generally around between AGI's sound.h and sound.cpp. Assimilated calcTrueSampleSize into another function.
svn-id: r28613
2007-08-14 12:44:44 +00:00
Kari Salminen
27ea9d581b Unified intendation, purely visual changes.
svn-id: r28611
2007-08-14 08:49:20 +00:00
Kari Salminen
cbba39d0bb Not saving Apple IIGS instrument header's unneeded info anymore (Priority increment and spare byte).
svn-id: r28610
2007-08-14 08:47:49 +00:00
Kari Salminen
7460eb55a1 Added a couple of simple AgiSound stop, play, isPlaying-functions.
svn-id: r28598
2007-08-13 21:15:27 +00:00
Kari Salminen
eb7dd9970f Grouped wave lists together into oscillators (Oscillators always consists of two waves).
svn-id: r28597
2007-08-13 16:05:46 +00:00
Kari Salminen
985ac6ceaa Made calcTrueSampleSize seek back to stream's start when ending the function.
svn-id: r28595
2007-08-13 15:18:44 +00:00
Kari Salminen
8801cf9b3c Moved read- and finalize-functions into corresponding structs and fixed calls to them where needed.
svn-id: r28594
2007-08-13 15:13:58 +00:00
Kari Salminen
c0cde76df9 Added more functions to help with determining the Apple IIGS samples' real lengths.
svn-id: r28592
2007-08-13 14:06:30 +00:00
Max Horn
3f22960a65 Fix warning() format string
svn-id: r28518
2007-08-11 08:16:18 +00:00
Kari Salminen
6ea171189b Added Apple IIGS sample's true size calculation (A zero byte can end the sample prematurely).
svn-id: r28514
2007-08-10 15:33:07 +00:00
Kari Salminen
9df29f1123 Parsing Apple IIGS wave info into more easily accessible variables in the memory.
svn-id: r28513
2007-08-10 13:04:59 +00:00
Kari Salminen
f200150590 Added Apple IIGS instruments and wave file loading.\n(Apple IIGS music playing is broken at the moment).
svn-id: r28508
2007-08-09 17:44:07 +00:00
Kari Salminen
ae1f66994e Brought back and changed some variables from inside a #if 0 ... #endif
svn-id: r28507
2007-08-09 17:26:41 +00:00
Kari Salminen
89c30c871f Removed old loadInstruments().
svn-id: r28506
2007-08-09 17:11:38 +00:00
Kari Salminen
03d5bbf253 Added a couple of new constants and modified an existing one.
svn-id: r28505
2007-08-09 17:07:36 +00:00
Travis Howell
760986259c Fix compile warnings.
svn-id: r28501
2007-08-09 05:43:58 +00:00
David Corrales
6856535010 Merged fsnode with trunk: r27971:28460
svn-id: r28462
2007-08-05 19:34:20 +00:00
Kari Salminen
44ddb2419b Fixes compilation error C2666: 'pow' : 7 overloads have similar conversions on Windows (VS2003), Xbox (VS2003) and Xbox 360 (VS2005). Thanks to Carch for reporting the compilation problems.
svn-id: r28446
2007-08-04 12:16:10 +00:00
Kari Salminen
532a662f5a Some Apple IIGS sound chip playing mode defines etc.
svn-id: r28445
2007-08-04 12:05:32 +00:00
Torbjörn Andersson
3447c0e264 Tell the user if saving a game fails. (I haven't tested the saveGameSimple()
function, since I don't know when it's used.) This should fix bug #1767237
("AGI: Saving games to non existing path").

svn-id: r28441
2007-08-04 06:18:28 +00:00
Kari Salminen
ff8ed07958 Added Apple IIGS arrow cursor data.
svn-id: r28436
2007-08-03 18:20:58 +00:00
Kari Salminen
02103a65a2 Figured out most missing parts of the Apple IIGS sample header. Added methods for reading Apple IIGS instrument headers.
svn-id: r28432
2007-08-03 14:22:20 +00:00
Kari Salminen
af16be07a1 Added reading of volume parameter from Apple IIGS AGI sample header.
svn-id: r28405
2007-08-02 11:39:45 +00:00
Kari Salminen
8299835cad Added methods for reading Apple IIGS AGI samples and creating AudioStream-objects out of them. Commented out some code to make things compile.
svn-id: r28404
2007-08-02 11:10:26 +00:00
Kari Salminen
8e5fb44fcb Added data for the Atari ST AGI palette and Apple IIGS AGI palettes V1 and V2.
svn-id: r28387
2007-08-01 18:14:10 +00:00
Filippos Karapetis
e27e8875f6 AGI game strings which are substituted in game texts may contain values as well, so use agiSprintf on them to substitute any values they may contain. Fixes bug #1760541 - "PQ1: Text output garbled"
svn-id: r28235
2007-07-27 12:59:41 +00:00
Filippos Karapetis
a5e6b75edb Re-enabled the 3 entries that can't have menus (KQ3 ST, KQ3 DOS 1.01, SQ1 DOS 1.0X). The ESC key will pause the game in those 3 games
svn-id: r28129
2007-07-17 20:17:28 +00:00
Neil Millstone
91426f82c6 Porting DS word completion keyboard changes from branch0-10-0.
svn-id: r28125
2007-07-16 22:55:44 +00:00
Kari Salminen
16529e58e6 Added 3 different Amiga AGI palettes (From oldest to newest). Changed initPalette so its easier to enable the usage of those palettes later.
svn-id: r28114
2007-07-15 21:33:28 +00:00
Filippos Karapetis
6376321e5a Enabled menus in some old AGI games (released in 1986) which did not have menus them originally: KQ1 Amiga and ST and early versions of KQ3 Amiga, SQ1 ST, SQ1 DOS and SQ1 Amiga. The GF_FORCEMENUS flag has been remaned to GF_MENUS. Also, two problematic versions of KQ3, a problematic version of SQ1 and a problematic version of Mixed up Mother Goose have been disabled. Finally, a duplicate detection entry for SQ1 has been removed
svn-id: r28095
2007-07-15 06:24:39 +00:00
Filippos Karapetis
ec742cb4fd Cleaned up comments
svn-id: r28034
2007-07-11 16:52:56 +00:00
Filippos Karapetis
1b17f2d6a7 Enable menus for Space Quest 1 (PC) 1.1A
svn-id: r28033
2007-07-11 16:49:44 +00:00
Filippos Karapetis
61d4dda19a Fix for SQ1 Amiga (v 1.2 1986): menus are forced in this version too, like with KQ3 Amiga
svn-id: r28025
2007-07-11 12:28:07 +00:00
Filippos Karapetis
1dfc0614b7 Fix for bug #1751390 in LSL1. When choosing a menu option, an appropriate event is set. If that event is equal to 0x20, it was incorrectly triggered when the space bar key was pressed
svn-id: r28024
2007-07-11 11:46:02 +00:00
Torbjörn Andersson
7a7212b9c1 Fixed bug #1751385 ("LSL: Impossible to enter "Number 9""), which was
introduced when migrating to KEYCODE constants. Considering how silly the bug
was, I probably introduced it myself.

svn-id: r28017
2007-07-10 21:24:58 +00:00
Kari Salminen
6e77abc07f Add Amiga-style menus (FR #657645). Used in Amiga-rendering mode.
svn-id: r28015
2007-07-10 18:32:24 +00:00
Kari Salminen
969df42d01 Make AGI's button drawing use AgiButtonStyle. Doesn't use Amiga-style yet. It's next.
svn-id: r28014
2007-07-10 18:08:35 +00:00
Torbjörn Andersson
83e038de19 For some reason, AgiTextColor(amigaBlack, _olderAgi? amigaOrange : amigaPurple)
caused a linking error on my computer. Worked around that, and added curly
braces for (IMO) better readability.

svn-id: r28013
2007-07-10 17:41:40 +00:00
Kari Salminen
b2cae8fe15 Oops. AgiButtonStyle::getColor's color parameters were bool rather than int. Fixed.
svn-id: r28011
2007-07-10 17:04:09 +00:00
Kari Salminen
be23a6e188 Change AgiTextColor's default color to black text on white background.
svn-id: r28010
2007-07-10 15:45:30 +00:00
Kari Salminen
80cdd532bc Add AgiButtonStyle and create correct style according to render mode (Supports PC and Amiga styles).
svn-id: r28009
2007-07-10 15:28:43 +00:00
Filippos Karapetis
11b43f877d Fix for bug #1742432 - AGI: Engine crashes if no game is detected
svn-id: r27993
2007-07-09 17:39:47 +00:00
Filippos Karapetis
e10a6e6515 Fix for bug #1746661: "KQ3: Lockup when pressing ESC (Amiga version)"
svn-id: r27989
2007-07-09 12:03:53 +00:00
David Corrales
9bfe5d5354 Merged the FSNode branch with trunk r27681:27969
svn-id: r27970
2007-07-08 16:58:54 +00:00
Torbjörn Andersson
8e7269a100 Only redraw the save/load dialog when something in it has changed.
svn-id: r27942
2007-07-06 17:50:27 +00:00
Kari Salminen
118181e848 Added data for an Amiga-style busy mouse cursor (An hourglass). Not used yet though.
svn-id: r27941
2007-07-06 16:50:44 +00:00
Kari Salminen
ceca6a82f1 Added Amiga-style mouse cursor. Used with Amiga-render mode.
svn-id: r27938
2007-07-06 12:53:58 +00:00
Kari Salminen
1332a69b07 Tidied up and simplified AGI mouse cursor management.
svn-id: r27937
2007-07-06 12:42:50 +00:00
Neil Millstone
91648d68e0 Adding hooks for word completion interface on DS port
svn-id: r27871
2007-07-02 22:45:21 +00:00
Max Horn
e2ad271bd8 Removing non-ASCII chars from source code
svn-id: r27818
2007-07-01 12:47:07 +00:00
Kari Salminen
2ff0ffadb8 Oops. An extra comma in the enum list's end. Removed.
svn-id: r27775
2007-06-29 18:41:06 +00:00
Kari Salminen
3a03470caa Set AGI monitor type variable (vMonitor/v26) according to render mode.
svn-id: r27774
2007-06-29 15:58:48 +00:00
Kari Salminen
1a7b91b7e2 Removed superfluous comment and converted an int to bool conversion to a more usual way.
svn-id: r27757
2007-06-28 14:33:17 +00:00
Kari Salminen
f55d08a2d9 Fix saving & restoring with AGI256 and AGI256-2 games.
(Should save, restore and use decodePicture's agi256-parameter correctly now).

svn-id: r27730
2007-06-26 16:06:58 +00:00
Kari Salminen
38cbbf14fc Add workaround for Gold Rush intro skipping bug #1737343.
svn-id: r27719
2007-06-25 22:06:58 +00:00
Kari Salminen
4d7d3d96f5 Removed obsolete code for setting transparent debugging console colors.
svn-id: r27714
2007-06-25 18:32:40 +00:00
Kari Salminen
696b99e9b7 Unified GfxMgr::putPixelsA-function's priority info handling.
svn-id: r27710
2007-06-25 17:18:51 +00:00
Kari Salminen
a741f3c010 Fix priority screen showing when using AGI256 or AGI256-2.
svn-id: r27707
2007-06-25 14:40:40 +00:00
David Corrales
7091babe4d Missed some files in the branch/trunk merge.
svn-id: r27682
2007-06-23 19:04:15 +00:00
David Corrales
cacd7a28fd Merged the FSNode branch with trunk r27031:27680
svn-id: r27681
2007-06-23 18:51:33 +00:00
Max Horn
8a721de91c AGI: Properly handle backspace key on all systems, not just OS X
svn-id: r27638
2007-06-22 23:12:24 +00:00
Torbjörn Andersson
6f655ddbe5 Use KEYCODE constants.
svn-id: r27596
2007-06-21 20:04:10 +00:00
Kari Salminen
c8bbb6140f Add AGI256-2 support (On top of already present AGI256 support).
AGI256-2 means handling 256 color views/sprites (AGI256 means handling 256 color picture resources).
The code can now handle both 16 color and 256 color views/sprites in the same game.
FIXME: Background in AGI256-2 demo may be incorrect.

svn-id: r27572
2007-06-20 23:56:08 +00:00
Kari Salminen
0ebf986a1f Make putPixelsA-function use correct mask (0x0f normally for 16 colors, 0xff for 256 colors in AGI256 mode).
svn-id: r27571
2007-06-20 23:42:38 +00:00
Kari Salminen
dbac0054c1 Make drawing & blitting always use the correct screen
(Always 16 color screen for vector stuff, 256 color screen for everything else in AGI256 mode).

svn-id: r27570
2007-06-20 23:36:59 +00:00
Kari Salminen
d5822afe9e Add AGI256 picture resource loading using AGI command unknown170. Uses parts of patch #1728713.
svn-id: r27569
2007-06-20 23:18:24 +00:00
Kari Salminen
582fa4cdf0 Add AGI256 picture resource decoding support to PictureMgr::decodePicture.
svn-id: r27568
2007-06-20 23:12:38 +00:00
Kari Salminen
ae74b06756 Add an additional AGI screen for 256 color data (For use with AGI256 and AGI256-2).
svn-id: r27564
2007-06-20 22:54:51 +00:00
Kari Salminen
9f1ec5cb7a Add AGI256 and AGI256-2 game feature flags to games that use them.
svn-id: r27562
2007-06-20 22:39:14 +00:00
Kari Salminen
8b4b8a95a0 svn-id: r27561 2007-06-20 22:16:18 +00:00
Max Horn
ac1eea6265 Fixed warning about signedness issues
svn-id: r27402
2007-06-14 17:11:09 +00:00
Eugene Sandulenko
4d4cd489f5 Patch #1735773: "WAG file parsing patch to AGI's fallback detector".
Slightly modified, split into separate files.

svn-id: r27401
2007-06-14 12:06:12 +00:00
Max Horn
cbb378de1f Some cleanup to the pred.dic AGI code
svn-id: r27386
2007-06-13 13:26:46 +00:00
Kostas Nakos
a0cd025a16 implement predictive dictionary using ascii based operations, replacing the 10ary tree
svn-id: r27383
2007-06-13 12:48:14 +00:00