Commit Graph

99 Commits

Author SHA1 Message Date
D G Turner
617f6179c1 DREAMWEB: Change various loop variables to uint, rather than size_t.
This is partly for readability and partly to avoid any possible
portability issues i.e. though they should be the same, size_t is
defined by system headers, whereas uint is defined within our build
system.

Also, replaced a array size calculation with our ARRAYSIZE macro.
2012-11-30 12:08:55 +00:00
D G Turner
628cfa3d47 DREAMWEB: Objectify Sound functions & data into DreamWebSound class.
This change should have no functional change, but makes the sound code
more decoupled, modular and readable, prior to attempting a fix for
bug #3528164 - "DREAMWEB: missing sound effects/music cues during main
title".
2012-05-31 05:16:10 +01:00
Alyssa Milburn
256d160679 DREAMWEB: Remove shared temp graphics variables.
Instead, have a different variable for each use.
2012-02-23 22:34:22 +01:00
Max Horn
36778c8221 DREAMWEB: Remove unnecessary DreamWebEngine:: uses 2011-12-28 23:56:30 +01:00
Max Horn
c6dfac9b0a DREAMWEB: Move more methods to keypad.cpp, reorder them to match ASM 2011-12-28 19:36:17 +01:00
Max Horn
ca7da4cffc DREAMWEB: Rename a member of SetObject & DynObject to objId
SetObject::name and DynObject::id are stored at the exact same offset,
and have the exact same meaning (see also objectMatches()). Now they
also have the same name, objId.
2011-12-28 16:36:16 +01:00
Filippos Karapetis
279746fcf0 DREAMWEB: Completely remove all of the runtime, and move everything into DreamWebEngine
Also, remove dead code (allocateMem/deallocateMem)
2011-12-28 15:07:17 +02:00
Willem Jan Palenstijn
57e940f678 DREAMWEB: Move all saved variables to a GameVars struct
The data segment is now completely unused.
2011-12-28 13:12:22 +01:00
Willem Jan Palenstijn
4c2d2684ea DREAMWEB: Mass-move variables out of data
This has been done by an automated search/replace, culling unused
variables in the process. The remaining variables in data are all stored
in savegames.
2011-12-28 02:36:52 +01:00
Willem Jan Palenstijn
90cb52b7f6 DREAMWEB: Streamline graphics file access 2011-12-27 23:01:58 +01:00
Willem Jan Palenstijn
08be0411b1 DREAMWEB: Streamline text file handling 2011-12-27 18:40:25 +01:00
D G Turner
5256919434 DREAMWEB: Move kSubtitles out of data blob. 2011-12-27 04:12:16 +00:00
D G Turner
5cfa1899bd DREAMWEB: Move kQuitRequested out of data blob. 2011-12-27 03:08:43 +00:00
Willem Jan Palenstijn
0be53a88d6 DREAMWEB: Move remaining use functions to DreamBase 2011-12-27 01:44:54 +01:00
Filippos Karapetis
4027e635d5 DREAMWEB: Remove dead code 2011-12-27 02:42:33 +02:00
Willem Jan Palenstijn
2bbc1cbd6a DREAMWEB: Clean up monitor functions 2011-12-27 01:37:35 +01: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
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
Willem Jan Palenstijn
2db59ab311 DREAMWEB: Move even more use-related functions to DreamBase 2011-12-26 13:02:18 +01:00
Max Horn
04a147921f DREAMWEB: Rename workToScreenCPP to workToScreen 2011-12-26 01:41:56 +01: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
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
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
b9839635ea DREAMWEB: Convert getObTextStart 2011-12-24 12:23:24 +01:00
Willem Jan Palenstijn
64b7aee081 DREAMWEB: Minor cleanup 2011-12-24 12:10:35 +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
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
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
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
656409c72b DREAMWEB: Fix regression in slabdoorb 2011-12-17 23:28:26 +01: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
f9d4886e50 DREAMWEB: Port 'usestereo' to C++ 2011-12-17 02:04:31 +02:00
Filippos Karapetis
b371c46af9 DREAMWEB: Port 'checkinside' to C++ 2011-12-17 00:43:09 +02:00
Filippos Karapetis
654a60a90c DREAMWEB: Rewrote useCashCard() in C++ and got rid of moneyPoke() and its associated offsets in the data blob 2011-12-17 00:01:45 +02:00
Filippos Karapetis
12cac260c9 DREAMWEB: Port 'isryanholding' to C++ 2011-12-16 22:04:47 +02:00
Max Horn
202f9d18f1 DREAMWEB: Move more things to DreamBase; cleanup some code 2011-12-16 17:43:33 +01:00
Max Horn
f878f0453a DREAMWEB: Convert useGun to C++ 2011-12-16 16:25:38 +01:00
Max Horn
d1ed87bece DREAMWEB: Convert notHeldError to C++, move stuff to DreamBase 2011-12-15 14:09:53 +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
Filippos Karapetis
dd8304dd75 DREAMWEB: Port 'usehandle', 'usealtar' to C++ 2011-12-15 00:43:08 +02:00
Filippos Karapetis
ea8b6c8c6d DREAMWEB: Port 'findsetobject' and 'findexobject' to C++ and simplify compare() 2011-12-15 00:12:25 +02:00
Willem Jan Palenstijn
5948b5a9e3 DREAMWEB: Allow quit from diary 2011-12-14 12:33:08 +01:00
Willem Jan Palenstijn
5af0deba87 DREAMWEB: Cleanup 2011-12-14 12:17:32 +01:00
Filippos Karapetis
b27a6e72ad DREAMWEB: Port 'runtap' to C++ 2011-12-13 01:02:41 +02:00