D G Turner
f592849653
DREAMWEB: Correct monitor header message alignment in floppy versions.
2011-12-29 08:09:29 +00:00
D G Turner
59458c9b15
DREAMWEB: Simplify finalization call in dreamweb main function.
...
Thanks to Fingolfin for the suggestion.
2011-12-29 02:58:19 +00:00
D G Turner
311e1c495c
DREAMWEB: Minor clean up and removal of goto usage in dreamweb().
2011-12-28 23:37:16 +00:00
Max Horn
93ee179641
DREAMWEB: Minor cleanup
2011-12-29 00:00:44 +01:00
Max Horn
36778c8221
DREAMWEB: Remove unnecessary DreamWebEngine:: uses
2011-12-28 23:56:30 +01:00
Max Horn
9f99fb5f8a
DREAMWEB: Use ObjectType enums in more places
2011-12-28 23:53:54 +01:00
Max Horn
dc4af2afc2
DREAMWEB: Added commandOnlyCond() method
2011-12-28 23:06:49 +01:00
Max Horn
bfd891d571
DREAMWEB: Mark some member vars as only being used in keypad.cpp; cleanup
2011-12-28 23:06:49 +01:00
Willem Jan Palenstijn
32e5778d1f
DREAMWEB: Fix crash when loading a room without reels
2011-12-28 20:11:36 +01:00
Max Horn
e2c006f793
DREAMWEB: Remove global file handle
2011-12-28 19:59:53 +01:00
Willem Jan Palenstijn
ea6546ae25
DREAMWEB: Clean up checkCoords
2011-12-28 19:55:06 +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
Filippos Karapetis
e2aaba4a69
Merge pull request #154 from fingolfin/dreamweb-cleanup
...
Dreamweb: Mark structs packed, minor tweaks
2011-12-28 10:29:53 -08:00
Filippos Karapetis
6a5c75a439
DREAMWEB: Changed hasSpeech() to also take account of the audio settings
...
This fixes an assert in the madman sequence
2011-12-28 20:26:15 +02:00
Filippos Karapetis
972ebc0c75
DREAMWEB: Allow skipping the mad man sequence with the ESC key
2011-12-28 20:15:08 +02:00
Filippos Karapetis
eaed1b725a
DREAMWEB: Replaced most isCD calls with calls checking for speech
...
This is quite useful for devices with limited storage, where the user
can use the CD version without its speech files
2011-12-28 18:54:17 +02:00
Willem Jan Palenstijn
63da2ac271
DREAMWEB: Clean up some constants
2011-12-28 16:48:10 +01:00
Max Horn
13e252ebd0
DREAMWEB: Add 'packed' attribute to structs that need it
...
... and probably also to some that don't need it; since it seems better to
err on the wrong side here for now, I did not check every struct as to whether
it really needs this. On the long run, it would be better if the code did not
rely on any kind of packing anyway.
2011-12-28 16:36:18 +01:00
Max Horn
8f2b8e821f
DREAMWEB: Cleanup
2011-12-28 16: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
Max Horn
c10ea611e8
DREAMWEB: Rename getEitherAdCPP to getEitherAd, use obj type enums
2011-12-28 16:36:16 +01:00
Willem Jan Palenstijn
77b8491b8b
DREAMWEB: Remove unused Sprite fields
2011-12-28 15:19:59 +01:00
Willem Jan Palenstijn
4e207dbc7a
DREAMWEB: Clean up Sprite::_updateCallback
2011-12-28 15:19:59 +01:00
Filippos Karapetis
6e95c6d690
DREAMWEB: Fix a regression in monkSpeaking (y should be unchanged)
2011-12-28 16:18:08 +02:00
Filippos Karapetis
1c17b277eb
DREAMWEB: Mark all of the differences between the floppy and CD versions
...
- Add TODOs for the CD checks in setupTimedTemp() and startTalk()
- The current doSomeTalk() is for the CD version only
- Implement a difference of the CD version in intro
2011-12-28 16:16:41 +02:00
Filippos Karapetis
89fb830be6
DREAMWEB: Implemented the floppy version of monkSpeaking()
2011-12-28 15:59:58 +02:00
Filippos Karapetis
2f634e9b2c
DREAMWEB: Remove obsolete README
2011-12-28 15:15:31 +02:00
Filippos Karapetis
198900069e
DREAMWEB: Remove some now-redundant references to the DreamWeb namespace
2011-12-28 15:12:30 +02: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
Filippos Karapetis
26f1643e86
DREAMWEB: Remove a lot of unused/duplicate constants and move some of them to dreambase.h
2011-12-28 12:15:52 +02:00
Filippos Karapetis
fe98fbe972
DREAMWEB: Move all zoom-related functions to vgagrafx.cpp, and remove a lot of unused global constants
2011-12-28 11:38:18 +02:00
Filippos Karapetis
ed72efe05b
DREAMWEB: Remove more global variables
2011-12-28 05:47:09 +02:00
Filippos Karapetis
1d4337ebb5
DREAMWEB: Remove some unused globals
2011-12-28 05:27:16 +02:00
D G Turner
1ff19e19e7
DREAMWEB: Move checkCoords templated implementation to Dreambase header.
...
The PSP (MIPS) toolchain generates differing symbols for this template
and thus fails to link. By moving the implementation to the defining
header, this should fix this.
2011-12-28 02:49:27 +00: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
D G Turner
a09fdaa0b1
DREAMWEB: Move 4 volume related variables out of data blob.
2011-12-28 01:31:24 +00:00
D G Turner
5492307982
DREAMWEB: Move 'speechloaded' flag out of data blob.
2011-12-28 00:40:00 +00:00
D G Turner
93173a11ca
DREAMWEB: Move 'wongame' flag out of data blob.
2011-12-28 00:04:12 +00:00
D G Turner
56191e3928
DREAMWEB: Move 3 sound related variables out of data blob.
2011-12-27 23:49:35 +00:00
Willem Jan Palenstijn
5e915afcd4
DREAMWEB: Remove unused functions
2011-12-27 23:09:47 +01:00
Willem Jan Palenstijn
914bf3d519
DREAMWEB: Remove setdat, freedat segments
2011-12-27 23:05:27 +01:00
Willem Jan Palenstijn
15a1f41e8a
DREAMWEB: Remove reels segment
2011-12-27 23:04:58 +01:00
Willem Jan Palenstijn
d9aed2e00b
DREAMWEB: Convert room text into TextFiles
2011-12-27 23:03:40 +01:00
Willem Jan Palenstijn
a7cdc342b3
DREAMWEB: Convert reel segments into GraphicsFiles
2011-12-27 23:03:05 +01:00
Willem Jan Palenstijn
f729742f87
DREAMWEB: Convert exText into TextFile
2011-12-27 23:02:33 +01:00
Willem Jan Palenstijn
e54196f37f
DREAMWEB: Remove Extras segment
2011-12-27 23:02:33 +01:00
Willem Jan Palenstijn
90cb52b7f6
DREAMWEB: Streamline graphics file access
2011-12-27 23:01:58 +01:00
Willem Jan Palenstijn
8ed39a2b9e
DREAMWEB: Fix uninitialized variable
2011-12-27 23:01:07 +01:00
Filippos Karapetis
d0a302fb06
DREAMWEB: Add the ability to blacklist unused constants in tasm-recover
2011-12-27 19:53:41 +02:00
Willem Jan Palenstijn
08be0411b1
DREAMWEB: Streamline text file handling
2011-12-27 18:40:25 +01:00
Willem Jan Palenstijn
df7bb24184
DREAMWEB: Create MapFlags struct, remove backdrops segment
2011-12-27 18:01:33 +01:00
Willem Jan Palenstijn
7bae1022ed
DREAMWEB: Remove mapData segment
2011-12-27 17:56:50 +01:00
Willem Jan Palenstijn
39a0153fbf
DREAMWEB: Remove mapStore segment
2011-12-27 17:56:50 +01:00
Filippos Karapetis
4c9a600618
DREAMWEB: Remove dead code
2011-12-27 10:43:44 +02:00
Filippos Karapetis
51d0a07902
DREAMWEB: Fix a regression in showRain()
2011-12-27 10:43:10 +02:00
Filippos Karapetis
bda312b61b
DREAMWEB: Remove more unused/unnecessary variables
2011-12-27 10:16:06 +02:00
Filippos Karapetis
e63baf1521
DREAMWEB: Remove unused global variables
2011-12-27 10:06:19 +02:00
D G Turner
ead3089fa2
DREAMWEB: Move kCurrentsample out of data blob.
2011-12-27 04:59:56 +00:00
D G Turner
0155e88d10
DREAMWEB: Move kRoomssample out of data blob.
...
N.B. Last commit was kForeignRelease, not kSubtitles.
2011-12-27 04:39:50 +00:00
D G Turner
5256919434
DREAMWEB: Move kSubtitles out of data blob.
2011-12-27 04:12:16 +00:00
D G Turner
7db571812a
DREAMWEB: Move kSubtitles out of data blob.
2011-12-27 03:34:54 +00:00
D G Turner
5cfa1899bd
DREAMWEB: Move kQuitRequested out of data blob.
2011-12-27 03:08:43 +00:00
D G Turner
5511779085
DREAMWEB: Minor removal of runtime residue in vgagrafx.cpp
...
Also, minor formatting fixes.
2011-12-27 02:18:52 +00:00
Filippos Karapetis
107805c343
DREAMWEB: Remove almost all of the ASM runtime
2011-12-27 03:11:22 +02:00
Willem Jan Palenstijn
5dd3e1f6dc
DREAMWEB: Remove more unused data from blob
2011-12-27 02:03:17 +01: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
9bf5a1930d
DREAMWEB: Blacklist the main dreamweb function
2011-12-27 01:48:40 +01: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
e10d2bffa0
DREAMWEB: Move operand1, currentfile out of data
2011-12-27 01:37:35 +01:00
Willem Jan Palenstijn
2bbc1cbd6a
DREAMWEB: Clean up monitor functions
2011-12-27 01:37:35 +01:00
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