Commit Graph

298 Commits

Author SHA1 Message Date
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