94 Commits

Author SHA1 Message Date
Paul Gilbert
75be177e90 Removed misspelled version of disassembly folder
svn-id: r22788
2006-05-31 08:32:05 +00:00
Paul Gilbert
5fa3985bcb Player now moves out of the way if he's blocking an entrance when an NPC enters. Also changed errors in unimplemented NPC actions to warnings
svn-id: r22731
2006-05-29 08:12:07 +00:00
Torbjörn Andersson
8062eb6ec3 Set and show/hide mouse cursors through a "cursor manager" (analogous to the
recently added (cursor) palette manager) so that the cursor can be properly
restored after returning from the GUI.

If there's any C++ magic that can keep the backend functions from being called
by anything else than these managing classes, that would probably be a good
idea. Also, since the cursor manager keeps a copy of the cursor image, perhaps
there are at least some backends that will no longer need to?

svn-id: r22639
2006-05-25 22:51:42 +00:00
Paul Gilbert
622c8b57e7 Reworked the DISPATCH current action to support NPC schedules like the original game does. Additionally added basic implementation of necessary support routines
svn-id: r22582
2006-05-23 12:43:42 +00:00
Paul Gilbert
e22de3ab36 Added a new outer loop for what will later allow the restarting of the game. Also added the animation of the Skorl catching the player if the game state indicates it has happened
svn-id: r22581
2006-05-23 12:41:28 +00:00
Paul Gilbert
dddaa015df Added the loading of NPC schedules
svn-id: r22580
2006-05-23 12:39:39 +00:00
Paul Gilbert
0ebf2be4a4 Added new resource entries for NPC schedules, the Skorl catching animation, and miscellaneous
svn-id: r22579
2006-05-23 12:38:51 +00:00
Paul Gilbert
6bac5a257e Added support structures for NPC schedules
svn-id: r22578
2006-05-23 12:37:43 +00:00
Paul Gilbert
3e4566e196 Added some extra safety checks. Also contains some started work on redesigning the display of the current action
svn-id: r22577
2006-05-23 12:36:57 +00:00
Paul Gilbert
5f64d7009e Added script methods for manipulating current action support data and a stub for a script method that plays background music
svn-id: r22576
2006-05-23 12:24:50 +00:00
Paul Gilbert
fa23893974 Disassembled code responsible for making NPCs walk between rooms
svn-id: r22476
2006-05-14 22:11:14 +00:00
Torbjörn Andersson
d6af07989d This could be completely wrong, but I don't think Hotspot::stopWalking() is
supposed to call setCurrentAction() in Resources, because then ScummVM will
crash in getCurrentActionStr() whenever we try to interact with any object.

Since Hotspot::walkTo() calls setCurrentAction() in Hotspot, it seems like a
reasonable guess that this is the setCurrentAction() that stopWalking() should
call as well.

svn-id: r22409
2006-05-11 08:25:09 +00:00
Torbjörn Andersson
21b91adcdf Changed "it's" to "its" in a few comments.
svn-id: r22408
2006-05-11 08:04:41 +00:00
Torbjörn Andersson
dba0c5ca2c Whitespace changes.
svn-id: r22407
2006-05-11 07:59:50 +00:00
Paul Gilbert
30231a39c8 Added proper labels in some of the existing disassembled methods
svn-id: r22406
2006-05-11 07:25:54 +00:00
Torbjörn Andersson
e2656a276a Changed abs() to ABS()
svn-id: r22389
2006-05-08 13:34:21 +00:00
Paul Gilbert
b20966b92b Initial disassembly of NPC schedule handling methods
svn-id: r22380
2006-05-07 22:36:26 +00:00
Max Horn
84b2a4f76f It's wrong to assume a given file is located in gameDataPath, so do not use that to print out warnings that pretend otherwise
svn-id: r22272
2006-05-01 22:27:56 +00:00
Paul Gilbert
5584ea5c7e Incremented required lure.dat version
svn-id: r22236
2006-04-30 05:35:39 +00:00
Paul Gilbert
8f1604e4cf Added load of new script offset field for NPC handling of hotspots
svn-id: r22235
2006-04-30 05:34:54 +00:00
Max Horn
0aabdf821c Fix warning
svn-id: r22210
2006-04-29 11:56:59 +00:00
Paul Gilbert
1192f0dfca Enhanced hotspot action so that the player will properly walk to a hotspot before performing an action
svn-id: r22209
2006-04-29 11:22:05 +00:00
Paul Gilbert
946d0582dc Added proper action display after selection along with showing the camera cursor
svn-id: r22208
2006-04-29 11:19:55 +00:00
Paul Gilbert
8b184ad5b0 Changed resource Id constants, added a few more general constants, and slightly increased game speed
svn-id: r22207
2006-04-29 11:18:08 +00:00
Paul Gilbert
302c825a17 Reworked resource loading to no longer load hotspot proximities separately, or provide access to the list
svn-id: r22206
2006-04-29 11:17:06 +00:00
Paul Gilbert
3e8763f454 Reworked resources to handle moved hotspot proximity (walk to) co-ordinates
svn-id: r22205
2006-04-29 11:15:03 +00:00
Paul Gilbert
d88ce16b12 Tweaked dialog display code to refresh the screen and warn about message Ids needing display styles that aren't yet implement
svn-id: r22204
2006-04-29 11:13:47 +00:00
Max Horn
bf73598811 * Changed the createEngine() factory function of our plugins to return an error code (the engine is now passed indirectly via a double pointer)
* Removed Engine_Empty (obsolete now that engines can return actual error codes)

svn-id: r22199
2006-04-29 00:27:20 +00:00
Paul Gilbert
14beeb3492 Added disassembly of door close support routines and other miscellaneous action support code
svn-id: r22162
2006-04-25 22:38:00 +00:00
Torbjörn Andersson
72906f2508 Made the Lure engine call updateScreen() more often - particularly when using
the menu bar at the top of the window - for smoother mouse movement. (After a
discussion with sev.)

svn-id: r21992
2006-04-17 23:37:22 +00:00
Max Horn
ba1b25305e Removed the directory parameter from md5_file
svn-id: r21937
2006-04-16 12:50:39 +00:00
Max Horn
68cb7f52c8 - Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*
- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916
2006-04-15 20:36:41 +00:00
Eugene Sandulenko
9610a4daef Fix warning.
svn-id: r21810
2006-04-11 22:11:12 +00:00
Torbjörn Andersson
d846f9a5e1 Added delays to the main and menu event loops to keep Lure from gobbling up all
available CPU time.

svn-id: r21787
2006-04-11 11:55:27 +00:00
Torbjörn Andersson
cba4871140 Changed max() to MAX(). This fixes compilation for me.
svn-id: r21786
2006-04-11 11:34:06 +00:00
Paul Gilbert
e3254a8879 Added disassembly of room exit handling, as well as a few cleanups to the path finding code
svn-id: r21785
2006-04-11 10:53:24 +00:00
Paul Gilbert
b8c80af183 Added proper path finding code for rooms, as well as miscellaneous support methods
svn-id: r21784
2006-04-11 10:52:11 +00:00
Paul Gilbert
4b91326131 Added a destRoomNumber variable to store which room a highlighted exit goes to, as well as some temporary code used to display pathfinding information onscreen when Toggle Info is turned on
svn-id: r21783
2006-04-11 10:50:18 +00:00
Paul Gilbert
169c8d78d1 Implemented better handling of changing rooms via room exits
svn-id: r21782
2006-04-11 10:48:28 +00:00
Paul Gilbert
7b32b7ef9c Added new resources for pathfinding and new resources
svn-id: r21781
2006-04-11 10:46:36 +00:00
Paul Gilbert
9b87224036 Resource loader enhanced to load hotspot proximity data and room walkable areas
svn-id: r21780
2006-04-11 10:45:22 +00:00
Paul Gilbert
f6b2cf2c6d Updated resource structures to add support for hotspot y corrections, proximity data, room walkable areas, and the room exit coordinate list
svn-id: r21779
2006-04-11 10:43:53 +00:00
Paul Gilbert
70654bc2a9 Added a script method for setting a blocking hotspot script
svn-id: r21778
2006-04-11 10:42:32 +00:00
Eugene Sandulenko
5a2ad04a9e Introduced language EN_ANY used for general English game entries. EN_USA and
EN_GRB should be used for games which have both variants. Currently it is
MM NES and BASS. All other are switched to EN_ANY.

svn-id: r21702
2006-04-08 23:12:56 +00:00
Max Horn
e7a8bb6abf Modified the REGISTER_PLUGIN macro so that it allows (and requires) a trailing semicolon (this helps certain tools to parse our code better)
svn-id: r21689
2006-04-08 12:06:07 +00:00
Max Horn
8cf8acfd63 Renamed various *GameSettings to GameSettings (our namespaces are enough to distinguish them)
svn-id: r21686
2006-04-08 11:21:04 +00:00
Paul Gilbert
4ee3298550 Completed disassembly of the Lure pathfinding code
svn-id: r21593
2006-04-04 11:53:45 +00:00
Max Horn
8cdee5a931 Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling.
svn-id: r21500
2006-03-29 15:59:37 +00:00
Max Horn
9f93e5bb81 Renamed various container isEmpty() methods to empty() to match STL conventions
svn-id: r21472
2006-03-28 09:42:54 +00:00
Paul Gilbert
b54d73d220 Further progress on disassembling pathfinding and support methods
svn-id: r21470
2006-03-27 21:32:43 +00:00