libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 16:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,999 Commits 5 Branches 5 Tags 1.8 GiB
4420b15d9f
Commit Graph

376 Commits

Author SHA1 Message Date
Paweł Kołodziejski
99447628ac fixed warning 
svn-id: r11069
 2003-11-02 22:38:04 +00:00
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
Paweł Kołodziejski
9588a6fd31 fixed warnings 
svn-id: r11046
 2003-11-02 10:12:08 +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
ae9fe77479 Instead of having a function that reverses the panning table, we now have a 
function that creates the panning table. The difference is that you now
have to tell whether you want one for normal or reverse stereo, so you are
not dependent on the previous state of the table.

(I still think it may be possible to get rid of the panning table
completely, but that's for later cleanups.)

svn-id: r11027
 2003-11-01 18:12:04 +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
Torbjörn Andersson
6011bd6cdc Save the config file when options are changed. 
svn-id: r11014
 2003-10-31 07:43:26 +00:00
Torbjörn Andersson
d7bd7d44b8 Use the ScummVM config manager instead of a separate BS2-specific config 
file, plus some other cleanup. I don't know how the config manager decides
if/when to save the settings to file, but we can worry about that later.

svn-id: r11001
 2003-10-29 07:53:05 +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
Torbjörn Andersson
7418c47b48 If we fail to read the game settings, use sensible defaults. 
svn-id: r10990
 2003-10-28 13:46:28 +00:00
Max Horn
a4d2a47820 factor out common debugger code 
svn-id: r10984
 2003-10-26 21:30:52 +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
320b0a405a Corrected/clarified some debug messages/comments 
svn-id: r10945
 2003-10-23 07:08:09 +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
64aaaa0b25 Small cleanup, and added FIXME comment. 
svn-id: r10907
 2003-10-19 18:01:05 +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
Nicolas Bacca
70667d14da Alignment fix in debug message 
svn-id: r10742
 2003-10-12 13:04:46 +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
Torbjörn Andersson
d5bd6812ee Some cleanups and clarifications. Mainly, we no longer refer to the 
inventory/conversation menu (which is drawn at the bottom of the screen) as
the "top menu".

svn-id: r10693
 2003-10-09 06:57:35 +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
a29d128bd3 Use RandomSource instead of rand(). 
svn-id: r10682
 2003-10-08 18:02:53 +00:00
Torbjörn Andersson
a1f4dc2c90 cleanup 
svn-id: r10681
 2003-10-08 17:09:51 +00:00
Torbjörn Andersson
7adf0ff1fc Some more cosmetic changes while I'm considering the next move. (Or maybe 
I'm just hoping that if I stall long enough, someone else will make the
move for me. :-)

svn-id: r10676
 2003-10-08 06:58:34 +00:00
Torbjörn Andersson
29b646b30a Some cleanup, some code removal and some unstubbing. Nothing important. 
svn-id: r10659
 2003-10-07 07:07:47 +00:00
Torbjörn Andersson
e8b6016e33 Renamed the FontRenderer class as FontRendererGui since there's another 
font renderer for the game itself. (It just doesn't live in any separate
class yet.)

svn-id: r10658
 2003-10-07 07:06:50 +00:00
Torbjörn Andersson
e04c760847 Removed obsolete FIXME comment 
svn-id: r10631
 2003-10-06 07:32:54 +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
Max Horn
d4734bd4f2 use namespace Common a bit more; don't zero the RNG in scumm (else the seed gets reset); remove obsolete 256 color blending code 
svn-id: r10592
 2003-10-04 11:50:21 +00:00
Torbjörn Andersson
f8ce610c2b Moved some stuff out of driver96.h. Eventually I'd like to get rid of most 
Moved some stuff out of driver96.h. Eventually I'd like to get rid of this
file completely. Or at the very least most of it.

svn-id: r10589
 2003-10-04 08:31:20 +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
Max Horn
eabeb62e20 fix doxygen comment 
svn-id: r10570
 2003-10-03 13:59:44 +00:00
Max Horn
aed27b35dd use C++ struct naming instead of typedefs -> this fixes (or works around, whatever you prefer to call it) the GCC_PACK problem in Doxygen 
svn-id: r10569
 2003-10-03 13:53:46 +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
Max Horn
0e645f88ae renamed namespace ScummVM to Common 
svn-id: r10544
 2003-10-02 17:43:02 +00:00
Torbjörn Andersson
c8de7d5089 Cleanups, mostly related to sound effects. 
svn-id: r10532
 2003-10-02 07:01:12 +00:00
Torbjörn Andersson
13773455a4 whitespace changes 
svn-id: r10517
 2003-10-01 10:00:35 +00:00
Torbjörn Andersson
2a41216f08 ScummVM naming conventions and cleanup in the Sword2Sound class. 
svn-id: r10514
 2003-10-01 06:36:25 +00:00
Torbjörn Andersson
46d195ee02 Clear cutscene subtitles before changing back the palette, and slow down 
the subtitles slightly.

svn-id: r10503
 2003-09-30 16:07:04 +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
7fff8b0134 Removed - it's the same file as _mouse.h 
svn-id: r10487
 2003-09-29 14:20:36 +00:00
Torbjörn Andersson
4d5f98fd2f cleanup 
svn-id: r10486
 2003-09-29 14:19:22 +00:00
Torbjörn Andersson
33685d8350 cleanup (I meant to do this in my previous commit) 
svn-id: r10485
 2003-09-29 14:06:02 +00:00
Torbjörn Andersson
3cdf7abe68 cleanup 
svn-id: r10484
 2003-09-29 13:46:49 +00:00
Torbjörn Andersson
8284aa2047 cleanup 
svn-id: r10483
 2003-09-29 13:38:17 +00:00
Torbjörn Andersson
93b8cefe19 Tiny whitespace / comment change. 
svn-id: r10478
 2003-09-29 06:48:48 +00:00
Torbjörn Andersson
0ac7630ebb cleanup 
svn-id: r10468
 2003-09-28 16:38:00 +00:00
Torbjörn Andersson
d4f6639802 cleanup 
svn-id: r10467
 2003-09-28 16:27:51 +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
Nicolas Bacca
1f5d51c258 Alignment fix 
svn-id: r10459
 2003-09-28 14:08:20 +00:00
Torbjörn Andersson
1d831d0cea cleanup 
svn-id: r10432
 2003-09-27 17:41:02 +00:00
Torbjörn Andersson
54a2470c9f Began unifying the function documentation in driver96.h with the one in the 
individual files, into what I hope are doxygen ones.

svn-id: r10431
 2003-09-27 17:00:15 +00:00
Torbjörn Andersson
e19e7c879a Save enough information about the currently playing music before the 
credits so that it can be properly resumed afterwards.

svn-id: r10429
 2003-09-27 16:10:43 +00:00
Torbjörn Andersson
796fcfff7e Removed inaccurate comment 
svn-id: r10428
 2003-09-27 16:05:40 +00:00
Torbjörn Andersson
d1df731855 Removed CopyScreenBuffer() since it was a no-op anyway. 
svn-id: r10427
 2003-09-27 15:44:26 +00:00
Torbjörn Andersson
bac0fab43d cleanup 
svn-id: r10426
 2003-09-27 15:38:42 +00:00
Torbjörn Andersson
442fd0cdf8 I don't think UpdatePaletteMatchTable() has to write the table to file. In 
fact, I'm not even sure the !data case ever happens.

svn-id: r10425
 2003-09-27 15:30:17 +00:00
Torbjörn Andersson
3278a0dce6 cleanup 
svn-id: r10424
 2003-09-27 15:20:15 +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
f18b4addb8 cleanup 
svn-id: r10415
 2003-09-26 14:19:03 +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
b7a5024daf Ok, I'm stupid. 
The initial sample is, indeed, two bytes, just like the rest of them, but
it really, really helps if you read it from the correct position in the
file.

After fixing that, it turned out that my changing of signedness of the
sample was also wrong. Funny how those two bugs almost cancelled each other
out. Almost.

I've made a few other changes as well, but they're just to clean things up
a bit. The credits music works for me, and I've played the game up to
arriving in Quaramonte, with no obvious music-related problems.

svn-id: r10412
 2003-09-26 06:26:18 +00:00
Torbjörn Andersson
f5d8300043 Really clear the screen during the credits. 
svn-id: r10408
 2003-09-25 13:04:46 +00:00
Torbjörn Andersson
a4b32b67e8 Reverted part of the previous change. Control panel music should work again 
but the credits music is still broken. I'll have to take a closer look at
this later.

svn-id: r10407
 2003-09-25 11:35:54 +00:00
Torbjörn Andersson
b9cc1725b7 Some minor fixes. Unfortunately I've noticed that there is some major sound 
distortion in the credits music, and I haven't yet figured out what's
causing this.

svn-id: r10406
 2003-09-25 10:02:52 +00:00
Torbjörn Andersson
99eee3fb84 Rewrote the music code to use a premix function instead of a timer. I'm 
speculating that the timer didn't always fill the buffer quite fast enough
and that this is what caused the occasional popping noises.

Of course, I may have introduced all kinds of regressions - particularly
since I don't have any big-endian computer to test on - but we're all
friends here, right? :-)

svn-id: r10404
 2003-09-25 06:11:07 +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
6e59a2df00 Removed unused / replaced source code. This turned out to be most of the 
file. :-)

svn-id: r10385
 2003-09-23 17:24:45 +00:00
Torbjörn Andersson
4ae1674a44 Removed ancient version history. Much of it doesn't apply to us, and was 
cluttering up the files anyway. (Though I do feel a slight twinge of guilt
for removing historical records like this. :-)

svn-id: r10384
 2003-09-23 16:53:25 +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
273e1ac1a0 Fixed really brain-dead bug. (I made it myself - I can call it whatever I 
want to! :-) Escaping a cutscene while the voice-over is playing should
work now.

svn-id: r10369
 2003-09-23 06:34:19 +00:00
Torbjörn Andersson
fa8ccef9a4 Removed unused code 
svn-id: r10368
 2003-09-23 06:31:13 +00:00
Torbjörn Andersson
c7b8a6c01b cleanup 
svn-id: r10367
 2003-09-23 06:30: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
0ac7aa0671 whitespace fixes 
svn-id: r10365
 2003-09-23 06:23:29 +00:00
Torbjörn Andersson
bd6eece093 Initialize the cutscene voice-over sound handle, in case you press Escape 
before there is any speech.

svn-id: r10364
 2003-09-23 06:22:36 +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
8e28b0c6b4 Cleaned up the sound code enough to add cutscene voice-overs. I haven't had 
the time to do much testing yet, but it seems to work for me.

svn-id: r10361
 2003-09-22 06:36:38 +00:00
Max Horn
58721a629d No need to do endian conversion if you check for 0, as BE 0 == LE 0 
svn-id: r10359
 2003-09-21 18:25:34 +00:00