libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 08:48:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
51,834 Commits 5 Branches 5 Tags 1.8 GiB
1938d95c4e
Commit Graph

1296 Commits

Author SHA1 Message Date
Filippos Karapetis
74537d9eee DREAMWEB: The monsource global is no longer used. Also, added a missing comment in dirFile() 2011-12-27 02:08:15 +02:00
Filippos Karapetis
b406276529 DREAMWEB: Cleanup of getKeyAndLogo(), dirFile() and read() 2011-12-27 02:02:54 +02:00
D G Turner
72800fac9d DREAMWEB: Improved 'getKeyAndLogo' function signature. 
This removes a remaining al usage.
 2011-12-26 23:06:49 +00:00
D G Turner
6a7e798f46 DREAMWEB: Ported 'dirfile' to C++ 
Needs some checking of es:di usage and work to remove _operand1 to
dreambase.h
 2011-12-26 21:23:38 +00:00
Willem Jan Palenstijn
2cd0b29de1 DREAMWEB: Convert searchForString 2011-12-26 21:58:17 +01:00
Filippos Karapetis
a75d39895b DREAMWEB: Move some functions to DreamBase, remove dead code 2011-12-26 22:47:14 +02:00
Filippos Karapetis
fb07400086 DREAMWEB: Remove dead code 2011-12-26 22:35:05 +02:00
Filippos Karapetis
1ba4f0a1a8 Revert "DREAMWEB: Remove dead code and move most functions to DreamBase" 
This reverts commit 4c66f74b58.

These functions aren't ready to be moved yet till the remaining two are
finished, and they're so crossreferenced that the safest thing to do is
revert this commit and break it down to smaller chunks
 2011-12-26 22:31:50 +02:00
Filippos Karapetis
4c66f74b58 DREAMWEB: Remove dead code and move most functions to DreamBase 2011-12-26 22:10:20 +02:00
Willem Jan Palenstijn
b5ad84a05d DREAMWEB: Move inputline out of data blob 2011-12-26 20:54:48 +01:00
Willem Jan Palenstijn
b08804f360 DREAMWEB: Convert 'parser' 2011-12-26 20:46:37 +01:00
D G Turner
bd70cd9dff DREAMWEB: Ported 'read' to C++ 2011-12-26 20:45:39 +00:00
Filippos Karapetis
f5da710da4 DREAMWEB: Remove more unused global variables 2011-12-26 21:30:02 +02:00
Willem Jan Palenstijn
cb3eee8635 DREAMWEB: Reduce dependency on globals and move functions to DreamBase 2011-12-26 20:03:52 +01:00
Willem Jan Palenstijn
6f85de6b6e DREAMWEB: Combine transferMap and transferInv 2011-12-26 20:03:52 +01:00
Willem Jan Palenstijn
c2a94132c8 DREAMWEB: Convert pickupConts 2011-12-26 18:42:28 +01:00
Filippos Karapetis
82b6f6c97b DREAMWEB: Cleanup searchForFiles() 2011-12-26 19:01:38 +02:00
Willem Jan Palenstijn
1237004756 DREAMWEB: Minor cleanup 2011-12-26 17:53:04 +01:00
Willem Jan Palenstijn
15bb44dda1 DREAMWEB: Remove now unused Buffers segment 2011-12-26 17:42:19 +01:00
Willem Jan Palenstijn
c86a830c4a DREAMWEB: Move openInvList, ryanInvList out of buffers 2011-12-26 17:42:19 +01:00
Willem Jan Palenstijn
017c1ed993 DREAMWEB: Update deallocatemem for moved sprite table 2011-12-26 17:42:19 +01:00
Willem Jan Palenstijn
c60ce59aa4 DREAMWEB: Fix regression in transferToEx 2011-12-26 17:27:17 +01:00
Filippos Karapetis
4106ae7d2d DREAMWEB: Port 'dircom' to C++, move rootdir out of the data blob and fix a regression in searchForFiles() 2011-12-26 17:50:48 +02:00
Filippos Karapetis
8c3488a973 DREAMWEB: Remove the now unused ASM style versions of getanyad, getexad, getfreead and getsetad 2011-12-26 16:54:03 +02:00
Filippos Karapetis
3b9b4cb6ba DREAMWEB: Fix a regression in fillOpen() and remove the now unused getOpenedSize() 2011-12-26 16:54:02 +02:00
Willem Jan Palenstijn
1fef9d1f75 DREAMWEB: Convert findAllOpen, fillOpen 2011-12-26 16:54:00 +02:00
Filippos Karapetis
63ba3988ff DREAMWEB: Port 'transfertoex' to C++ 2011-12-26 16:10:28 +02:00
Filippos Karapetis
e311f678b9 DREAMWEB: Move pressList out of the data blob, and remove loads of unused global variables from the data blob 2011-12-26 15:06:15 +02:00
Filippos Karapetis
047a9dc19d DREAMWEB: Fix regression in loadRoomsSample() 2011-12-26 15:04:06 +02:00
Willem Jan Palenstijn
2db59ab311 DREAMWEB: Move even more use-related functions to DreamBase 2011-12-26 13:02:18 +01:00
Filippos Karapetis
d7335d69e3 DREAMWEB: Move the roomsCanGo array out of the data blob 2011-12-26 13:59:20 +02:00
Filippos Karapetis
2ca00bc3c6 DREAMWEB: Cleanup searchForFiles() 2011-12-26 13:33:37 +02:00
Filippos Karapetis
1b11f48a35 DREAMWEB: Cleanup identifyOb() 2011-12-26 13:18:09 +02:00
D G Turner
6f8a4bb336 DREAMWEB: Ported 'searchforfiles' to C++ 2011-12-26 05:46:01 +00:00
D G Turner
389afc4666 DREAMWEB: Port 'findpathofpoint' to C++ 2011-12-26 05:02:51 +00:00
Filippos Karapetis
d503838fd6 DREAMWEB: Moved the two rollEndCredits functions together in print.cpp and renamed them to rollEndCreditsGameWon and rollEndCreditsGameLost 2011-12-26 03:15:47 +02:00
Filippos Karapetis
9a89f8884c Merge pull request #153 from fingolfin/dreamweb-cleanup 
Dreamweb: Port rollEm() to C++, remove dead code
 2011-12-25 16:58:58 -08:00
Filippos Karapetis
7945a0fbb0 DREAMWEB: Cleaned up findFirstPath(), fixed a regression and moved it to DreamBase 2011-12-26 02:50:02 +02:00
Max Horn
a4643a0484 DREAMWEB: Move titles.cpp to DreamBase 2011-12-26 01:41:56 +01:00
Max Horn
dbe5b50cd3 DREAMWEB: Port rollEm() to C++ 2011-12-26 01:41:56 +01:00
Max Horn
04a147921f DREAMWEB: Rename workToScreenCPP to workToScreen 2011-12-26 01:41:56 +01:00
Max Horn
d015f5d446 DREAMWEB: Remove some dead code 2011-12-26 01:41:55 +01:00
D G Turner
c7b1ec2198 DREAMWEB: Ported 'findfirstpath' to C++. 
This conversion could do with a bit more work to remove the es/ax/cx
temp usage and clean up the code.
 2011-12-25 23:33:11 +00:00
Filippos Karapetis
1f346baa92 DREAMWEB: Port 'findopenpos' to C++ 2011-12-25 22:31:07 +02:00
Filippos Karapetis
bdded1ce12 DREAMWEB: The ASM-style version of getEitherAd() is no longer needed 2011-12-25 22:11:27 +02:00
Filippos Karapetis
95c9a6d8cd DREAMWEB: Move all of the functions in newplace.cpp into DreamBase 2011-12-25 21:10:20 +02:00
Filippos Karapetis
e27a5931c8 DREAMWEB: Remove getdestinfo() and access the roomPics array directly in locationPic() 2011-12-25 21:00:30 +02:00
Filippos Karapetis
6dbc930b18 DREAMWEB: Remove getDestInfo() from locationPic 
This allows to move some more functions into DreamBase
 2011-12-25 19:48:49 +02:00
Filippos Karapetis
95ffd7f4ce DREAMWEB: Port 'purgeanitem' to C++, some cleanup 2011-12-25 19:25:00 +02:00
Filippos Karapetis
eaf87bdfa7 DREAMWEB: Port 'emergencypurge' to C++ 2011-12-25 18:42:13 +02:00
Filippos Karapetis
21a278bb63 DREAMWEB: Port 'outofopen' to C++ 2011-12-25 18:26:13 +02:00
Filippos Karapetis
bf4271dfc1 DREAMWEB: Port 'swapwithopen' to C++ 2011-12-25 17:54:22 +02:00
Filippos Karapetis
c531c4c1ea DREAMWEB: Port 'swapwithinv' to C++ 2011-12-25 17:32:56 +02:00
Filippos Karapetis
0fff97b4b0 DREAMWEB: Port 'useopened' to C++ 2011-12-25 17:10:49 +02:00
Filippos Karapetis
e322d6257d DREAMWEB: Port 'locationpic', 'reexfrominv' to C++ 2011-12-25 16:33:30 +02:00
Filippos Karapetis
3802b21183 DREAMWEB: Move some functions to DreamBase 2011-12-25 15:07:56 +02:00
Filippos Karapetis
3ac88c16ea DREAMWEB: Port 'selectopenob' to C++ 2011-12-25 14:30:00 +02:00
Filippos Karapetis
e412078319 DREAMWEB: Name the return values of getAnyAd 2011-12-25 14:13:48 +02:00
Willem Jan Palenstijn
5e976490c7 DREAMWEB: Move remaining talk functions to DreamBase 2011-12-25 13:02:56 +01:00
Willem Jan Palenstijn
85e5457402 DREAMWEB: Move talk functions to DreamBase 2011-12-25 12:54:12 +01:00
Willem Jan Palenstijn
fb068a1dbc DREAMWEB: Simplify order of checkObjectSize checks 2011-12-25 12:41:37 +01:00
D G Turner
4bb6305e59 DREAMWEB: Change hangOnPQ function signature to avoid carry flag usage. 2011-12-25 07:42:04 +00:00
D G Turner
088c145f8f DREAMWEB: Port 'dosometalk' to C++ 2011-12-25 07:28:29 +00:00
Filippos Karapetis
652403021d DREAMWEB: Convert 'checkobjectsize' to C++ 
Also, renamed getOpenedSizeCPP() to getSlotCount(). Special thanks to
wjp for his help and for examining the behavior of a fallback case.
 2011-12-25 04:53:26 +02:00
D G Turner
a1ffa11620 DREAMWEB: Port 'getpersontext' to C++ 2011-12-24 23:00:11 +00:00
D G Turner
df269f839d DREAMWEB: Ported 'starttalk' to C++ 2011-12-24 22:24:05 +00:00
Willem Jan Palenstijn
8e36de736e DREAMWEB: Minor cleanup 2011-12-24 14:41:12 +01:00
Willem Jan Palenstijn
42068065b5 DREAMWEB: Move more functions to DreamBase 2011-12-24 14:23:34 +01:00
Willem Jan Palenstijn
bcf789274f DREAMWEB: Move many use-related functions to DreamBase 2011-12-24 13:52:50 +01:00
Willem Jan Palenstijn
efb9057dda DREAMWEB: Remove unused function 2011-12-24 13:12:00 +01:00
Filippos Karapetis
be1a4de291 DREAMWEB: Port 'dropobject' to C++ 2011-12-24 13:32:39 +02:00
Willem Jan Palenstijn
b9839635ea DREAMWEB: Convert getObTextStart 2011-12-24 12:23:24 +01:00
Willem Jan Palenstijn
0133ca823e DREAMWEB: Fix wrong buffer size 2011-12-24 12:10:35 +01:00
Willem Jan Palenstijn
64b7aee081 DREAMWEB: Minor cleanup 2011-12-24 12:10:35 +01:00
Filippos Karapetis
99a5db2049 DREAMWEB: Fix typo in incRyanPage() 2011-12-24 01:09:17 +02:00
Filippos Karapetis
1cb1df3699 DREAMWEB: Port 'incryanpage' to C++ 2011-12-24 01:02:43 +02:00
Willem Jan Palenstijn
8e79608a1d DREAMWEB: Move sprite table out of buffers 2011-12-23 23:46:38 +01:00
Willem Jan Palenstijn
bbdbffc107 DREAMWEB: Move changes out of buffers 2011-12-23 23:46:38 +01:00
Willem Jan Palenstijn
10774daa58 DREAMWEB: Move backgrounds, zoom space, initial vars out of buffers 2011-12-23 23:46:38 +01:00
Willem Jan Palenstijn
814793de49 DREAMWEB: Move rainlist out of buffers 2011-12-23 23:46:38 +01:00
Willem Jan Palenstijn
109acaab3c DREAMWEB: Move mapflags out of buffers 2011-12-23 23:46:38 +01:00
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
Willem Jan Palenstijn
99b7fce611 DREAMWEB: Fix regression in sparky 2011-12-23 17:09:46 +01: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
Willem Jan Palenstijn
341a2d6874 DREAMWEB: Fix regression in deleteExObject 
(thanks to Fingolfin)
 2011-12-20 14:07:01 +01:00
Willem Jan Palenstijn
f5e8b3257e DREAMWEB: Fix regressions in intoInv, outOfInv; cleanup selectOb 2011-12-20 00:06:49 +01:00
Filippos Karapetis
5a3deea58e DREAMWEB: More work on inToInv and outOfInv 2011-12-19 23:48:13 +02:00
Filippos Karapetis
f0eee81d32 DREAMWEB: Port 'intoinv', 'outofinv' to C++ 2011-12-19 03:24:03 +02:00
Filippos Karapetis
0cd53d5d3e DREAMWEB: Port 'lookatplace' to C++ 2011-12-18 21:07:27 +02:00
Filippos Karapetis
5843fc1157 DREAMWEB: 'nextcolon' is unused 2011-12-18 20:22:03 +02:00
Filippos Karapetis
25b99c448d DREAMWEB: Rewrite signOn into C++, and remove the users and passwords from the data blob 
Note that the string processing logic in signOn is a bit different from
the original, but the end result is the same (with cleaner code)
 2011-12-18 20:17:55 +02:00
Filippos Karapetis
833507695e DREAMWEB: Remove the now unused 'keynum' and 'newlogonum' variables from the data blob 2011-12-18 17:58:43 +02:00
Willem Jan Palenstijn
60ece632b8 DREAMWEB: Remove reelRoutines from data blob 2011-12-18 16:54:16 +01:00
Willem Jan Palenstijn
49877b2319 DREAMWEB: Move all reel functions to DreamBase 2011-12-18 16:34:57 +01:00
Willem Jan Palenstijn
8449493eff DREAMWEB: Convert removeObFromInv, deleteExObject, deleteExFrame, deleteExText 2011-12-18 16:01:06 +01:00
Willem Jan Palenstijn
ebbc8ae3d2 DREAMWEB: Set es for reel callbacks while it may be necessary 2011-12-18 15:57:24 +01:00
Willem Jan Palenstijn
133cfc3ae9 DREAMWEB: Fix yet another regression in setPickup 
getAnyAd and getEitherAd have different inputs, so can't be
interchanged...
 2011-12-18 15:56:59 +01:00
Filippos Karapetis
62dc71a73a DREAMWEB: Port 'getkeyandlogo' to C++ 2011-12-18 16:43:05 +02:00
Filippos Karapetis
362f21d30d DREAMWEB: Port 'showkeys' to C++ 2011-12-18 15:44:17 +02:00
Filippos Karapetis
a5879196df DREAMWEB: Port 'showdiarykeys' to C++ 2011-12-18 15:44:16 +02:00
Max Horn
8c8666e811 DREAMWEB: Move backdrop.cpp and more to DreamBase; remove some dead code 2011-12-18 14:13:59 +01:00
Willem Jan Palenstijn
f0508dd05a DREAMWEB: Fix regression in useWinch 2011-12-18 14:08:32 +01:00
Willem Jan Palenstijn
cf73ee9939 DREAMWEB: Fix multiple regressions in checkInside and loadCart 2011-12-18 13:22:12 +01:00
Willem Jan Palenstijn
feaf297c75 DREAMWEB: Fix multiple regressions in setPickup 2011-12-18 13:06:05 +01:00
Willem Jan Palenstijn
4178ad6b68 DREAMWEB: Fix ReelRoutine terminator saving/loading 2011-12-18 12:38:53 +01:00
Filippos Karapetis
5d1e1fbbbc DREAMWEB: Spacing 2011-12-18 13:16:25 +02:00
Filippos Karapetis
09eaef6bcd DREAMWEB: Remove regression from b0a42f1 (duplicate saved reel data) 2011-12-18 13:08:27 +02:00
Filippos Karapetis
a1799ba091 DREAMWEB: Close the file opened in querySaveMetaInfos() when returning 2011-12-18 12:19:19 +02:00
Filippos Karapetis
421c8cd262 DREAMWEB: Port 'setpickup' to C++ and added an enum for the object types 2011-12-18 11:26:19 +02:00
Filippos Karapetis
9818def85b DREAMWEB: Port 'lookininterface' to C++ 2011-12-18 03:28:21 +02:00
Filippos Karapetis
83b31ccb1d DREAMWEB: Remove an erroneous comment (copy/paste error) 2011-12-18 03:07:54 +02:00
Filippos Karapetis
08fec8fa34 DREAMWEB: Add meta information to saved games 
This information includes savegame versioning and the saved game's
date/time, played time and game thumbnail. This information is stored
into an unused data block of the original save format, so the
generated ScummVM saves are (hopefully) fully compatible with the
original ones and can be loaded in the original interpreter
 2011-12-18 02:55:22 +02:00
Willem Jan Palenstijn
656409c72b DREAMWEB: Fix regression in slabdoorb 2011-12-17 23:28:26 +01:00
Willem Jan Palenstijn
10e1637612 DREAMWEB: Fix regressions in findExObject, findSetObject 2011-12-17 23:16:36 +01:00
Willem Jan Palenstijn
30089ec315 DREAMWEB: Convert clearBuffers, clearChanges 2011-12-17 22:28:54 +01:00
Willem Jan Palenstijn
46caa77164 DREAMWEB: Add disabled reelRoutine conversion work 2011-12-17 22:28:54 +01:00
Willem Jan Palenstijn
b0a42f115e DREAMWEB: Use serializer for ReelRoutines 2011-12-17 21:30:54 +01:00
Willem Jan Palenstijn
5958d2d29a DREAMWEB: Name some DynObject/SetObject fields 
Also change getAnyAd() behaviour to be consistent between Free/Ex and
Set objects, diverging from the original.
 2011-12-17 21:02:31 +01:00
Willem Jan Palenstijn
b8ab0e6217 DREAMWEB: Fix regression in getOpenedSize 2011-12-17 19:19:08 +01:00
Willem Jan Palenstijn
6dd09b8935 DREAMWEB: Convert checkForExit 2011-12-17 19:19:08 +01:00
Filippos Karapetis
f8bfe84c44 DREAMWEB: Remove dead code 2011-12-17 20:06:55 +02:00
Filippos Karapetis
855b5320b3 DREAMWEB: Use ScummVM's save/load dialogs by default 2011-12-17 19:30:48 +02:00
Filippos Karapetis
af1c8d774d DREAMWEB: Fix two off-by-one errors in saveGame(), rewrite scanForNames() to use listSavefiles() and use Common::strlcopy instead of strncpy 2011-12-17 19:30:06 +02:00
Filippos Karapetis
0731bcb5ac DREAMWEB: Implement removeSaveState() 2011-12-17 19:28:04 +02:00
Willem Jan Palenstijn
3185dac25e DREAMWEB: Work around runtime limitation 
The WordRef accessor writes back its value too late. Example: in the
call printDirect(data.word(kLastxpos), .....)
the destructor isn't called until after printDirect returns.
This destroys the modifications to lastXPos that printDirect makes.
 2011-12-17 16:40:15 +01:00
Filippos Karapetis
9fdb38d395 DREAMWEB: Fix another regression in the ASM-style version of getOpenedSize() 2011-12-17 16:32:12 +02:00
Filippos Karapetis
400bda78d2 DREAMWEB: Fix another regression in selectOb() (thanks wjp) 2011-12-17 16:21:32 +02:00
Filippos Karapetis
956abddc5c DREAMWEB: Fix regression in selectOb() (thanks wjp) 2011-12-17 15:50:48 +02:00
Filippos Karapetis
b1edf24462 DREAMWEB: Fix a regression in businessMan(), and updated its comments 2011-12-17 15:43:10 +02:00
Filippos Karapetis
7d38ba5619 DREAMWEB: Fix another regression in isRyanHolding() (thanks wjp) 2011-12-17 15:25:56 +02:00
Filippos Karapetis
1277958053 DREAMWEB: Fix regression in isRyanHolding() 2011-12-17 15:23:06 +02:00
Filippos Karapetis
710072c55b DREAMWEB: Fix regression in getOpenedSize() 2011-12-17 14:33:17 +02:00
Filippos Karapetis
05c5e224b4 DREAMWEB: Port 'findinvpos', 'selectob' to C++ and fix a regression in identifyOb() 2011-12-17 13:48:12 +02:00