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

74 commits

Author SHA1 Message Date
Torbjörn Andersson
7ec257ae3f Even more stuff moving into Sword2Engine. I'm tempted to make a new class 
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-02 18:50:09 +00:00
Torbjörn Andersson
2adc147600 Moved some more "homeless" functions into Sword2Engine. (Don't worry -- I 
promise I will get rid of g_sword2 later.)

svn-id: r11057
 2003-11-02 17:17:10 +00:00
Torbjörn Andersson
db9b8070f6 More moving of stuff into classes. I had to make a few changes/cleanups to 
events.cpp, so there could be regressions.

svn-id: r11053
 2003-11-02 15:58:45 +00:00
Max Horn
b27a871f87 turned NewGui into a singleton, and made OSystem a pseudo-singleton; added Widget::findWidget (preparing to add support for nested widgets, for the tab widget) 
svn-id: r11045
 2003-11-02 02:18:16 +00:00
Torbjörn Andersson
0435658b96 Create the gui object dynamically 
svn-id: r11026
 2003-11-01 17:08:23 +00:00
Torbjörn Andersson
94edf540ef More moving of stuff into classes 
svn-id: r11025
 2003-11-01 16:55:20 +00:00
Max Horn
078091e7f4 cleanup of game detector functions 
svn-id: r11024
 2003-11-01 16:39:26 +00:00
Max Horn
2fef2dcb84 bs2 -> sword2 
svn-id: r10997
 2003-10-28 19:51:30 +00:00
Max Horn
53db0a8a07 cleanup: removed version/id from GameSettings 
svn-id: r10995
 2003-10-28 17:07:25 +00:00
Max Horn
d581c99ab5 cleanup 
svn-id: r10982
 2003-10-26 19:16:59 +00:00
Torbjörn Andersson
7c4cc25cec Enable the debug console. Actually, what I've done is to adapt the debug 
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-26 15:42:49 +00:00
Torbjörn Andersson
59b72f2b38 Moved a few remaining pieces of the script interpreter into the Logic class 
svn-id: r10939
 2003-10-22 06:51:57 +00:00
Torbjörn Andersson
3be2f0f1e0 Moved some more stuff into the Logic class. 
svn-id: r10923
 2003-10-21 08:54:50 +00:00
Torbjörn Andersson
3a43829b88 Moved the opcode functions into the Logic class. 
svn-id: r10885
 2003-10-18 08:11:50 +00:00
Max Horn
0694eed273 moved game detection code out to the plugins 
svn-id: r10882
 2003-10-17 23:16:53 +00:00
Torbjörn Andersson
8b42d65a7e Dumped most of the remaining "driver" code into a new "Display" class. This 
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-15 06:40:31 +00:00
Max Horn
31ba12c800 some more target<->game cleanup 
svn-id: r10769
 2003-10-12 19:10:17 +00:00
Max Horn
36fd7ec445 some renaming for more consistent terminology (although we might want to 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-12 18:40:12 +00:00
Torbjörn Andersson
1b52e11d55 Moved the "router" code into a new Router class. I'm hoping this is 
analogous to the SkyAutoRoute class.

svn-id: r10754
 2003-10-12 14:40:04 +00:00
Torbjörn Andersson
02a157e745 Moved the text drawing stuff into a class of its own. (Adding another 
global variable which will hopefully be dealt with later.)

svn-id: r10734
 2003-10-11 12:26:53 +00:00
Torbjörn Andersson
ade93aabff cleanup 
svn-id: r10728
 2003-10-10 16:14:52 +00:00
Max Horn
5301edc383 some cleanup 
svn-id: r10720
 2003-10-10 13:55:08 +00:00
Max Horn
d177364715 new config manager. not everything is completed, and some things will still be changed, but it seems to work well enough to put it into CVS 
svn-id: r10687
 2003-10-08 21:59:23 +00:00
Torbjörn Andersson
7174a32c8e Made a separate class for the cutscene functions, removed some unused code 
and made some other minor cleanups.

svn-id: r10614
 2003-10-05 15:28:15 +00:00
Max Horn
b4e5d97994 factor out common gfx_mode/fullscreen setup code from the game engines into the main code (maybe putting this into the Engine constructor would be better, though?) 
svn-id: r10611
 2003-10-05 14:37:16 +00:00
Torbjörn Andersson
4fad04846a Changed to use #include "bs2/..." and removed the inclusion of standard C 
headers. Most (all?) of the ones we need should probably come from stdafx.h
instead.

svn-id: r10588
 2003-10-04 08:07:03 +00:00
Max Horn
2162df92fc removed Sword2 prefixes of most classes (made obsolete by our namespace usage); renamed Sword2State to Sword2Engine 
svn-id: r10583
 2003-10-04 01:09:29 +00:00
Max Horn
5a074e6137 added namespace Sword2 
svn-id: r10581
 2003-10-04 00:52:27 +00:00
Torbjörn Andersson
10fee205e1 Some renaming (ironic in the light of Fingolfin's recent namespace 
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-10-03 06:54:44 +00:00
Torbjörn Andersson
da1b4f1e36 Moved the memory manager functions into an object of its own (and enabled 
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-30 14:37:42 +00:00
Torbjörn Andersson
568a4bd839 Changed the resource manager object to use more ScummVM-like naming. 
svn-id: r10499
 2003-09-30 09:27:27 +00:00
Torbjörn Andersson
b8fa67a8bb Changed the "logic" object to use ScummVM naming conventions. 
svn-id: r10496
 2003-09-30 06:40:01 +00:00
Torbjörn Andersson
49fa159ed4 More cleanup, plus support for cutscene leadout music. For now, we only 
play that music for cutscenes that have subtitles.

svn-id: r10460
 2003-09-28 14:13:57 +00:00
Jonathan Gray
f9352cfc1c add alternate sword2 target for people who want to use the gui for game detection when the game is either a) on CD b) in a bunch of seperate directories in a structure like that of the CD. Of course pointing ScummVM at such things with the normal target via command line or config file work fine. As everyone awake at the moment only has the sold out version, this is specific to that. I don't know what files are at the root of the original CD we can use for detection purposes 
svn-id: r10423
 2003-09-27 15:01:35 +00:00
Torbjörn Andersson
8ad28e3a7e More cleanup, and I've replaced most - not quite all - of BS2's debug 
message functions with our own.

We still need to go through them and assign sensible debug levels to them.

svn-id: r10422
 2003-09-27 11:02:58 +00:00
Torbjörn Andersson
b21208e6a9 Some more reformatting / cleanup, and removal of comments that did nothing 
but say who added what when. (No disrespect intended, but this information
means very little to us.)

svn-id: r10413
 2003-09-26 10:07:18 +00:00
Torbjörn Andersson
09a01e4cbe Replaced abs() with ABS and BOOL with bool, plus some minor cleanups. 
svn-id: r10391
 2003-09-24 06:40:23 +00:00
Torbjörn Andersson
95a59bd049 Must ... make ... space ... for ... FotAQ ... 
svn-id: r10383
 2003-09-23 16:38:38 +00:00
Torbjörn Andersson
bef1facdbc Removed the screenshot code. (The SDL backend already has the ability to 
make screenshots.)

svn-id: r10382
 2003-09-23 16:13:13 +00:00
Torbjörn Andersson
57d99796ea Changed the keyboard handling to store "keyboard events", rather than just 
characters. Hopefully this will make things work smoother on the Mac, but I
have no way of testing that.

svn-id: r10376
 2003-09-23 15:59:52 +00:00
Torbjörn Andersson
f8591911ab Since we probably won't have anything like the original BS2 launcher menu, 
make the 'C' key run the credits. I haven't yet implemented the credits
function, but it does play the music at least.

svn-id: r10366
 2003-09-23 06:27:58 +00:00
Torbjörn Andersson
f3f7489b49 Set the mixer to use the maximum volume. BS2 has its own volume settings, 
and we want them to go all the way up to eleven.

svn-id: r10362
 2003-09-22 14:55:17 +00:00
Torbjörn Andersson
23373b0123 The usual cleanup. Removed the "run from CD" check. 
This pretty much concludes the first stage of the engine cleanup. All of
the files, except for console/debugging stuff and possibly some header
files, have been changed to use the ScummVM brace style.

As for the console, that one could probably do with some rewriting, in
which case cleaning it up first would just be unnecessary work.

The next stages of the cleanup should include renaming of variables and
functions to follow the ScummVM coding standards, and turning everything
into C++ classes. And so on.

Of course, the driver directory should go through a similar cleanup as
well.

This has all been enormously tedious, so don't count on me doing any of
these things at the moment. Particularly not turning everything into C++
classes. I'm really not that familiar with C++. :-)

svn-id: r10340
 2003-09-20 18:33:24 +00:00
Max Horn
6a4663824e added initial support for building our 4 adventure engines as loadable modules; right now only work on OS X; once we add more build rules, other systems with dlopen() should work, too (e.g. Linux); Windows support may come later. This is still very much WIP 
svn-id: r10304
 2003-09-18 18:23:53 +00:00
Max Horn
c1a678afeb new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner) 
svn-id: r10282
 2003-09-17 22:41:01 +00:00
Max Horn
468275bb94 added a static method setDefaultDirectory to class File; used this to simplify some code; added a global g_sound pointer in bs2, this cuts down on uses of g_sword2 (of course both should be removed on the long run); some other minor tweaks/fixes 
svn-id: r10278
 2003-09-17 21:06:16 +00:00
Oliver Kiehl
ffd39dc95a if saveslot specified with -x doesn't exist, show restore menu 
svn-id: r10256
 2003-09-14 21:45:42 +00:00
Oliver Kiehl
fe349d2d99 enable ``proper'' -x loading 
svn-id: r10255
 2003-09-14 21:10:14 +00:00
Torbjörn Andersson
5bf1974a08 Our ServiceWindows() never returns RDERR_APPCLOSED, and we always behave as 
if we have the focus, so there's no need to check.

svn-id: r10130
 2003-09-09 12:45:33 +00:00
Max Horn
f23a34c9e5 renamed VersionSettings -> TargetSettings and also renamed some of its members; added GameDetector::findTarget; made launcher use that new method; some initial preparations for Plugin code 
svn-id: r10092
 2003-09-08 15:38:34 +00:00