Commit Graph

417 Commits

Author SHA1 Message Date
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