Commit Graph

50865 Commits

Author SHA1 Message Date
Willem Jan Palenstijn
1749182e98 DREAMWEB: Move ObjPos lists out of buffers 2011-12-23 23:46:38 +01:00
Willem Jan Palenstijn
061d24bb82 DREAMWEB: Move palettes out of buffers 2011-12-23 23:46:38 +01:00
Willem Jan Palenstijn
00b0aafd4c DREAMWEB: Fix broken merge for pull request #151 2011-12-23 23:46:38 +01:00
Filippos Karapetis
f6d63ae6a8 DREAMWEB: Use the C++ versions of getAnyAd and makeWorn in some places
This allows us to remove the ASM style version of makeWorn()
2011-12-24 00:37:13 +02:00
Willem Jan Palenstijn
d40201103e Merge pull request #151 from fingolfin/dreamweb-cleanup-rebased
Conflicts:
	engines/dreamweb/dreamgen.cpp
	engines/dreamweb/stubs.cpp
2011-12-23 21:03:18 +01:00
Willem Jan Palenstijn
625a5ef2ed DREAMWEB: Minor cleanup 2011-12-23 20:45:51 +01:00
Willem Jan Palenstijn
b6a6778843 DREAMWEB: Remove more unnecessary globals 2011-12-23 20:36:32 +01:00
Willem Jan Palenstijn
6653c977ef DREAMWEB: Remove a few unnecessary globals 2011-12-23 20:26:00 +01:00
Willem Jan Palenstijn
0f36350e03 DREAMWEB: Fix regression from moving ReelRoutines out of data
The struct People still had an old-style pointer to a ReelRoutine.
Fix this by converting People to use a real ReelRoutine * and moving
the PeopleList from the buffers segment to a Common::List.

Thanks to digitall for the assistance with tracking this down.
2011-12-23 19:15:25 +01:00
Strangerke
c4af50ae63 TSAGE: R2R - Implement scene 3250 2011-12-23 18:17:33 +01:00
Willem Jan Palenstijn
99b7fce611 DREAMWEB: Fix regression in sparky 2011-12-23 17:09:46 +01:00
Paul Gilbert
1b98cd5686 TSAGE: Implemented R2R Scene 825 - Autodoc 2011-12-23 20:52:27 +11:00
Max Horn
c9e9e5d6d8 DREAMWEB: Add titles.cpp, move some methods to titles.cpp and talk.cpp 2011-12-23 10:18:02 +01:00
Max Horn
b2fcdd6c86 DREAMWEB: Move rest of saveload.cpp to DreamBase 2011-12-23 10:18:02 +01:00
Max Horn
b6e139d112 DREAMWEB: Convert resetLocation and purgeALocation to C++ 2011-12-23 10:18:01 +01:00
Max Horn
f41412186b DREAMWEB: Add newplace.cpp 2011-12-23 10:18:01 +01:00
Max Horn
ef98df5895 DREAMWEB: cleanup 2011-12-23 03:43:19 +02:00
Max Horn
cdc6bc421b DREAMWEB: Turn RectWithCallback into template
Also moves checkCoords to DreamBase, adding a nasty cast to it. This is a
temporary HACK, which allows moving functions that use checkCoords to
DreamBase one at a time, instead of all at once (and at the same time as
checkCoords). This can be undone once everything using checkCoords has been
moved to DreamBase.
2011-12-23 03:39:44 +02:00
Max Horn
a4ffb8fe54 DREAMWEB: Convert fadeDownMon, fadeUpMon, initialMonCols to C++
Note that the two fade methods are currently unused; the only calls to them
are commented out in the asm version of the code.
This change also removes showGroup()
2011-12-23 03:32:50 +02:00
Max Horn
d033566f6d DREAMWEB: Move most of saveload.cpp to DreamBase 2011-12-23 03:31:01 +02:00
Max Horn
2bdcbadbfe DREAMWEB: Yet more things to DreamBase 2011-12-23 03:30:59 +02:00
Filippos Karapetis
c7dbbc8606 DREAMWEB: Ported 'reminders' to C++ and renamed it to edensFlatReminders() 2011-12-23 03:27:27 +02:00
Travis Howell
3241d34a32 Add patch #3463338 - Detect Macintosh demo of Pajama Sam 1. 2011-12-23 10:39:42 +11:00
Willem Jan Palenstijn
4a1c516b98 README: Add Win7 config file location 2011-12-22 22:01:37 +01:00
Strangerke
014536cf3f TSAGE: R2R - Fix a couple of bugs in scene 2000, Fix calls to disableControl() with parameters
Also remove several obsolete warnings
2011-12-22 20:23:48 +01:00
Strangerke
2811d83670 TSAGE: Give a default value to the second parameter of disableControl(), as for enableControl() 2011-12-22 20:21:23 +01:00
Strangerke
0234bb5be2 TSAGE: R2R - Remove obsolete warning 2011-12-22 19:45:44 +01:00
Strangerke
086b0e5057 TSAGE: R2R - Scene 3100 (space port): Fix cursor used in signal(), rename an object 2011-12-22 19:42:13 +01:00
Strangerke
cdd9ab3b70 TSAGE: R2R - Implement scene 3245 2011-12-22 18:35:30 +01:00
Strangerke
e6a671b555 TSAGE: R2R - Implement scene 3240 2011-12-22 18:35:28 +01:00
Strangerke
fc671351cf TSAGE: R2R - Implement scene 3230 2011-12-22 18:35:27 +01:00
Strangerke
e10060f262 TSAGE: R2R - Implement scene 3220 2011-12-22 18:35:25 +01:00
Paul Gilbert
5f89ef2094 TSAGE: R2R look/use/talk fields are more appropriate in the SceneHotspot class 2011-12-22 22:26:08 +11:00
Tobias Gunkel
8b77f18c9e SCUMM: Revert now obsolete separation of state variables in player_appleII 2011-12-22 12:08:30 +01:00
Tobias Gunkel
12103981b7 SCUMM: Remove player_appleII logging 2011-12-22 12:08:29 +01:00
Tobias Gunkel
f7a869ccc5 SCUMM: Optimize player_appleII sample buffer
The AppleII sound player works in two phases: writing samples to the
sample buffer (sample
generation) or reading samples from the buffer and passing it to ScummVM's
output callback.
The sample buffer is read completely in the reading phase so the entries
of the already read samples of the buffer can be reused again during the
next write phase.
2011-12-22 12:08:28 +01:00
Tobias Gunkel
3a9f2c5f5b SCUMM: Use finer grained sound updates for player_appleII
This reduces the needed buffer size for the biggest type4 sound from 170kB to only 2 bytes
2011-12-22 12:08:28 +01:00
Tobias Gunkel
7d551c9e6e SCUMM: Wrap player_appleII sound generation functions in classes 2011-12-22 12:08:27 +01:00
Tobias Gunkel
ffc88c5ced SCUMM: Reduce sound buffer size for player_appleII
Sound generation functions are now called incrementally instead of just
once to generate the sound data. This reduces the max. buffer size
from 1.7MB to just ~100KB (piano, sound 50).
2011-12-22 12:08:26 +01:00
Tobias Gunkel
375047b729 SCUMM: Increase precision of player_appleII
Use fixed precision instead of integral numbers for sample conversion
2011-12-22 12:08:26 +01:00
Tobias Gunkel
8b7ad559c1 SCUMM: Aggregate speaker states of CPU cycles in between samples
- formerly only two sample levels were possible: 32767 or -32767. Now the
  speaker states (0/1) between two samples are aggregated by the new
  SampleConverter class to allow more accurate sample values between -32767
  and 32767.
- the player's state is moved into a separate state struct
2011-12-22 12:08:25 +01:00
Tobias Gunkel
e56d5df295 SCUMM: Fix error in player_appleII when both voices are triggered at the same time 2011-12-22 12:08:24 +01:00
Tobias Gunkel
109ba212c6 SCUMM: Add initial support for AppleII sound player 2011-12-22 12:08:23 +01:00
Paul Gilbert
a4934fe05a TSAGE: Moved look/use/talk descriptions to SceneItem class, and implemented R2R SceneExt::display 2011-12-22 21:55:46 +11:00
Paul Gilbert
b5e5328184 TSAGE: Implement R2R 2 parameter versions of Player disableControl and enableControl 2011-12-22 21:12:08 +11:00
Paul Gilbert
0319cd06ef CGE: Added explicit 'PACKED_STRUCT' macro to the HideDesc structure 2011-12-22 19:30:47 +11:00
Strangerke
877b6e9b1d TSAGE: R2R - Implement scene 3210 2011-12-22 07:44:58 +01:00
Strangerke
c40df9a6ed TSAGE: Work around a data issue in R2R.
The character name doesn't seem case sensitive in R2R
2011-12-22 00:33:18 +01:00
Strangerke
d49ffde8ea TSAGE: R2R - Implement scene 3200 2011-12-22 00:30:49 +01:00
Strangerke
53929044a6 TSAGE: R2R - Implement scene 3175 2011-12-21 22:42:16 +01:00