thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
50687 commits 35 branches 0 tags 1.4 GiB
Commit graph

52 commits

Author SHA1 Message Date
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
Willem Jan Palenstijn
b8ab0e6217 DREAMWEB: Fix regression in getOpenedSize 2011-12-17 19:19:08 +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
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
Filippos Karapetis
b289533e4d DREAMWEB: Fix regression in identifyOb 2011-12-17 01:39:29 +02:00
Filippos Karapetis
984010faae DREAMWEB: Port 'identifyob' to C++ 2011-12-16 22:29:41 +02:00
Max Horn
d1ed87bece DREAMWEB: Convert notHeldError to C++, move stuff to DreamBase 2011-12-15 14:09:53 +01:00
Max Horn
9ebcaa33e7 DREAMWEB: Move even more stuff to DreamBase 2011-12-15 13:45:43 +01:00
Max Horn
719f3ec178 DREAMWEB: Convert a bunch of stuff to C++ 
Specifically, I started with openOb() and withWhat() which allowed to
remove offset_commandline and offset_openchangesize. A clean conversion of
these required a conversion of printMessage2 and getOpenedSize.
 2011-12-15 13:44:40 +01:00
Willem Jan Palenstijn
2ff147352c DREAMWEB: Cleanup and add FIXMEs 2011-12-12 09:19:25 +01:00
Filippos Karapetis
447f0c6643 DREAMWEB: Use the C++ version of workScreen() in C++ code 2011-12-09 18:18:32 +02:00
Max Horn
bd71a3bcec DREAMWEB: Replace cs by data (outside of dreamgen.cpp) 2011-12-07 11:07:10 +01:00
Max Horn
0193ef590d DREAMWEB: Cleanup end of namespace comments 2011-12-06 21:49:41 +01:00
Bertrand Augereau
26889c1243 DREAMWEB: Removed 'icons1' and 'icons2' stubs 2011-12-04 18:32:55 +01:00
Bertrand Augereau
1f89c4e341 DREAMWEB: Less direct references to kIcons1 and kIcons2 2011-12-04 17:11:42 +01:00
Bertrand Augereau
22a7ab4424 DREAMWEB: Minor warning fix (shadowing) 2011-12-04 16:54:05 +01:00
Bertrand Augereau
38ec14b15b DREAMWEB: 'segRef' was redundant with 'getSegment' (thanks to Max for noting this) 2011-12-02 16:29:16 +01:00
D G Turner
349cbc527f DREAMWEB: Fix compilation due to dreamgen.* function renaming. 2011-12-01 19:43:43 +00:00
Bertrand Augereau
4192d1241a DREAMWEB: 'getbackfromob' ported to C++ 2011-11-26 17:04:07 +01:00
Bertrand Augereau
9c9b7e5a2c DREAMWEB: crt functions 2011-11-15 15:57:54 +01:00
Willem Jan Palenstijn
46ec2c4d73 DREAMWEB: Use strcpy/strlen instead of manual loops 2011-11-15 13:45:34 +01:00
Bertrand Augereau
5adf8b4864 DREAWMEB: 'transfertext' ported to C++ 2011-11-15 13:22:30 +01:00
Willem Jan Palenstijn
c2ec285175 DREAMWEB: Fix regression in obicons 
This fixes the 'use' icon on the winch controls.
Regression from 1f531c6f7f.
Thanks to fuzzie for spotting it.
 2011-11-15 10:27:49 +01:00
Willem Jan Palenstijn
b53a299790 DREAMWEB: Unhardcode checkcoords tables 
This patch makes __dispatch_call (even more) superfluous,
but does not yet remove it.
 2011-11-14 21:44:10 +01:00
Willem Jan Palenstijn
d3a84d6e68 DREAMWEB: Convert 'inventory' 2011-11-14 21:43:36 +01:00
Willem Jan Palenstijn
65e1eeb990 DREAMWEB: Move 'inventory' from dreamgen 2011-11-14 21:43:36 +01:00
Willem Jan Palenstijn
ae2c4bcaf0 DREAMWEB: Convert 'examineob' 2011-11-14 21:43:36 +01:00
Willem Jan Palenstijn
ceb36fe0d6 DREAMWEB: Move 'examineob' from dreamgen 2011-11-14 21:43:35 +01:00