aboutsummaryrefslogtreecommitdiff
path: root/sword2/sword2.cpp
AgeCommit message (Collapse)Author
2003-12-13removed GameSettings::detectname and GameSettings::midi; renamed ↵Max Horn
GameSettings::gameName to name; added temporary experimental MD5 hack svn-id: r11603
2003-12-10Cleaned up keyboard handling. The old code would misinterpret some keys,Torbjörn Andersson
e.g. it's 'C' or 'c' to display the credits, not some random function key. svn-id: r11549
2003-12-01Removed semi-colon after REGISTER_PLUGIN() to be consistent with the otherTorbjörn Andersson
game engines. svn-id: r11447
2003-12-01Removed some unnecessary / commented out code, and initialized the debugTorbjörn Andersson
console a bit earlier so that error messages about missing files will be more obvious to the user. (If an error happens that early, some of the debugger commands will cause ScummVM to crash. I might look into that later.) svn-id: r11443
2003-11-25cleanupTorbjörn Andersson
svn-id: r11364
2003-11-16More cleanup. I've eliminated all the temporary global variables I've addedTorbjörn Andersson
over the past few weeks, except for g_sword2. (Of course, this doesn't necessarily make the code any prettier, but we can work on that later.) svn-id: r11309
2003-11-15Mostly cleanup. Also prevented what would probably have been an infiniteTorbjörn Andersson
loop if ScummVM failed to find a file in the demo. (Now it should error out instead, which is marginally preferable.) svn-id: r11298
2003-11-13Re-enabled the CD swapping code, after rewriting it a bit.Torbjörn Andersson
If a cluster file isn't found the resource manager will first check if it's one of the files that it expects to find on the hard disk. If so, it's considered a fatal error. Otherwise it will present the user with an "Insert CD1" or "Insert CD2" message, just like the original did. Unlike the original, the user will have to press a button or click the mouse to indicate when he's done. I don't know if we even can detect the CD automatically in any portable way. As far as I can see, we'll need at least two separate path settings for this to actually work: one for the HD install directory, and one or two for the CDs. The file that are supposed to be found on the HD are only on one of the CDs, so the amount of CD swapping would probably be unbearable otherwise. As a consequence, I haven't actually tried running the game from CD yet. By the way, the old caching code has been removed completely now. All it did was to copy the cluster file to HD for faster access. ScummVM never did that, but so far no one has complained. svn-id: r11273
2003-11-11Removed SVM_timeGetTime(). We may as well call get_msecs() directly.Torbjörn Andersson
svn-id: r11260
2003-11-11Moved low-level keyboard and mouse handling to a new Input class, andTorbjörn Andersson
renamed the Display class Graphics for no better reason than me liking the phrase "sound and graphics" better than "sound and display". svn-id: r11258
2003-11-10cut down on unnecessary GameDetector referencesMax Horn
svn-id: r11239
2003-11-08cleanup whitespacesPaweł Kołodziejski
svn-id: r11212
2003-11-08Removed some now redundant header files.Torbjörn Andersson
svn-id: r11209
2003-11-08Moved more stuff into classes, changed some static allocation to dynamic,Torbjörn Andersson
and removed some of the references to global variables. At this point I believe everything in the main game engine has been moved into classes - not necessarily the correct ones, but still... However, there is some stuff in the driver directory that need to be taken care of as well. svn-id: r11207
2003-11-04Create g_logic dynamically. More moving of stuff into classes.Torbjörn Andersson
svn-id: r11129
2003-11-04More moving of stuff into classes.Torbjörn Andersson
svn-id: r11128
2003-11-03The resource and memory managers are now created dynamically.Torbjörn Andersson
Renamed the resource manager's open/close methods openResource() and closeResource() to avoid confusion. (It was I who originally shortened their names to open() and close(), but I've changed my mind now.) Moved more stuff into Sword2Engine. svn-id: r11088
2003-11-02Even more stuff moving into Sword2Engine. I'm tempted to make a new classTorbjörn Andersson
for the mouse stuff, but I need to think about that a bit more. I have a feeling the code could be cleaned up a bit anyway... svn-id: r11060
2003-11-02Moved some more "homeless" functions into Sword2Engine. (Don't worry -- ITorbjörn Andersson
promise I will get rid of g_sword2 later.) svn-id: r11057
2003-11-02More moving of stuff into classes. I had to make a few changes/cleanups toTorbjörn Andersson
events.cpp, so there could be regressions. svn-id: r11053
2003-11-02turned NewGui into a singleton, and made OSystem a pseudo-singleton; added ↵Max Horn
Widget::findWidget (preparing to add support for nested widgets, for the tab widget) svn-id: r11045
2003-11-01Create the gui object dynamicallyTorbjörn Andersson
svn-id: r11026
2003-11-01More moving of stuff into classesTorbjörn Andersson
svn-id: r11025
2003-11-01cleanup of game detector functionsMax Horn
svn-id: r11024
2003-10-28bs2 -> sword2Max Horn
svn-id: r10997
2003-10-28cleanup: removed version/id from GameSettingsMax Horn
svn-id: r10995
2003-10-26cleanupMax Horn
svn-id: r10982
2003-10-26Enable the debug console. Actually, what I've done is to adapt the debugTorbjörn Andersson
console from the SCUMM engine. I decided that would be easier than to clean up the original console code. Unfortunately there's a bunch of code that I just copied - a pretty lousy form of code-reusal. It'd be nice if the console could be made part of the Engine class, or something like that. Most of the debug commands seem to be working. Some aren't relevant for ScummVM, and some are a bit obscure so I'm not quite sure what they're supposed to be doing. svn-id: r10978
2003-10-22Moved a few remaining pieces of the script interpreter into the Logic classTorbjörn Andersson
svn-id: r10939
2003-10-21Moved some more stuff into the Logic class.Torbjörn Andersson
svn-id: r10923
2003-10-18Moved the opcode functions into the Logic class.Torbjörn Andersson
svn-id: r10885
2003-10-17moved game detection code out to the pluginsMax Horn
svn-id: r10882
2003-10-15Dumped most of the remaining "driver" code into a new "Display" class. ThisTorbjörn Andersson
touches a lot of the code, of course, and adds yet another global variable (temporarily, I hope), but everything still seems to work. Knock on wood. svn-id: r10806
2003-10-12some more target<->game cleanupMax Horn
svn-id: r10769
2003-10-12some renaming for more consistent terminology (although we might want to ↵Max Horn
reevaluate this): 'target' is what is in your config file; 'game' is what a frontend provide. E.g. the scumm frontend provides the game 'monkeyvga', and my config file has target 'monkeyvga-ger' configured to use that game svn-id: r10766
2003-10-12Moved the "router" code into a new Router class. I'm hoping this isTorbjörn Andersson
analogous to the SkyAutoRoute class. svn-id: r10754
2003-10-11Moved the text drawing stuff into a class of its own. (Adding anotherTorbjörn Andersson
global variable which will hopefully be dealt with later.) svn-id: r10734
2003-10-10cleanupTorbjörn Andersson
svn-id: r10728
2003-10-10some cleanupMax Horn
svn-id: r10720
2003-10-08new config manager. not everything is completed, and some things will still ↵Max Horn
be changed, but it seems to work well enough to put it into CVS svn-id: r10687
2003-10-05Made a separate class for the cutscene functions, removed some unused codeTorbjörn Andersson
and made some other minor cleanups. svn-id: r10614
2003-10-05factor out common gfx_mode/fullscreen setup code from the game engines into ↵Max Horn
the main code (maybe putting this into the Engine constructor would be better, though?) svn-id: r10611
2003-10-04Changed to use #include "bs2/..." and removed the inclusion of standard CTorbjörn Andersson
headers. Most (all?) of the ones we need should probably come from stdafx.h instead. svn-id: r10588
2003-10-04removed Sword2 prefixes of most classes (made obsolete by our namespace ↵Max Horn
usage); renamed Sword2State to Sword2Engine svn-id: r10583
2003-10-04added namespace Sword2Max Horn
svn-id: r10581
2003-10-03Some renaming (ironic in the light of Fingolfin's recent namespaceTorbjörn Andersson
suggestion, but I prepared the patch long before reading the mail :-). Also, the remaining parts of the control panel etc. have been moved into a class of their own. This is still work in progress. I'm well aware that some of the classes aren't as well separated as they ought to be, and that using global variables to keep track of the different classes probably isn't pretty. svn-id: r10561
2003-09-30Moved the memory manager functions into an object of its own (and enabledTorbjörn Andersson
debugging levels). This needs further cleanups, but I believe I have reached a stable point where I can commit it without too much anxiety. svn-id: r10502
2003-09-30Changed the resource manager object to use more ScummVM-like naming.Torbjörn Andersson
svn-id: r10499
2003-09-30Changed the "logic" object to use ScummVM naming conventions.Torbjörn Andersson
svn-id: r10496
2003-09-28More cleanup, plus support for cutscene leadout music. For now, we onlyTorbjörn Andersson
play that music for cutscenes that have subtitles. svn-id: r10460
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-18 02:35:27 +0000