Commit Graph

82 Commits

Author SHA1 Message Date
D G Turner
5cfa1899bd DREAMWEB: Move kQuitRequested out of data blob. 2011-12-27 03:08:43 +00:00
Filippos Karapetis
3ff26ba84f DREAMWEB: Move all of the functions to DreamBase and remove stubs.h 2011-12-27 03:00:00 +02:00
Willem Jan Palenstijn
0be53a88d6 DREAMWEB: Move remaining use functions to DreamBase 2011-12-27 01:44:54 +01:00
Filippos Karapetis
a75d39895b DREAMWEB: Move some functions to DreamBase, remove dead code 2011-12-26 22:47:14 +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
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
Willem Jan Palenstijn
1237004756 DREAMWEB: Minor cleanup 2011-12-26 17:53:04 +01:00
Willem Jan Palenstijn
c86a830c4a DREAMWEB: Move openInvList, ryanInvList out of buffers 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
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
1b11f48a35 DREAMWEB: Cleanup identifyOb() 2011-12-26 13:18:09 +02:00
D G Turner
389afc4666 DREAMWEB: Port 'findpathofpoint' to C++ 2011-12-26 05:02:51 +00: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
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
95ffd7f4ce DREAMWEB: Port 'purgeanitem' to C++, some cleanup 2011-12-25 19:25:00 +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
3ac88c16ea DREAMWEB: Port 'selectopenob' to C++ 2011-12-25 14:30:00 +02:00
Willem Jan Palenstijn
fb068a1dbc DREAMWEB: Simplify order of checkObjectSize checks 2011-12-25 12:41:37 +01: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
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
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
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
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
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
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
Willem Jan Palenstijn
8449493eff DREAMWEB: Convert removeObFromInv, deleteExObject, deleteExFrame, deleteExText 2011-12-18 16:01:06 +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
Willem Jan Palenstijn
feaf297c75 DREAMWEB: Fix multiple regressions in setPickup 2011-12-18 13:06:05 +01: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
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