libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-07 09:14:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,732 Commits 6 Branches 5 Tags
b17d77eae9
Commit Graph

54 Commits

Author SHA1 Message Date
Paweł Kołodziejski
b8e3dda84c - whitespaces 
- fix for compilation at MAX, at include types
- changed to our types

svn-id: r12344
 2004-01-12 19:08:04 +00:00
Torbjörn Andersson
c75f5efd2f Sync the credits so that the text scroll and music will last for about the 
same amount of time. I don't think the original did this, but it turned out
to be pretty easy.

svn-id: r12334
 2004-01-12 08:01:25 +00:00
Torbjörn Andersson
7309705db5 cleanup 
svn-id: r12322
 2004-01-11 16:53:33 +00:00
Torbjörn Andersson
b9c3b7b008 Removed redundant comments. 
svn-id: r12279
 2004-01-09 14:52:39 +00:00
Torbjörn Andersson
12cd552cab Allow quitting during cutscenes and credits again. This is getting a bit 
hackish...

svn-id: r12247
 2004-01-08 13:03:50 +00:00
Torbjörn Andersson
065f2bb9eb It's a new year in BS2 land, too! 
svn-id: r12181
 2004-01-06 13:44:17 +00:00
Torbjörn Andersson
eb5c4a1449 Made sure the screen is really cleared when drawing a dialog window, plus 
some other cleanups. (This was a regression caused by the less stupid
screen updates implemented recently.)

svn-id: r12180
 2004-01-06 13:33:28 +00:00
Torbjörn Andersson
5f9cfba548 Slowed down the credits slightly. With the recent optimizations, the music 
lasted longer than the text. Now the text lasts longer than the music.

svn-id: r12151
 2004-01-05 11:00:12 +00:00
Torbjörn Andersson
8a91ae3257 Adapted LavosSpawn's idea for more efficient screen updating. It still 
renders the entire screen every frame, but it tries to update (i.e. copy to
the backend) only the parts of the screen that actually changed. At least
approximately so.

svn-id: r12142
 2004-01-04 15:11:30 +00:00
Torbjörn Andersson
0d327b3b79 Some tweaking of the new credits code. It is no longer necessary to have 
to have the credits.bmp file, though if you don't you won't see the
"Smacker" logo. (Whether or not this is a feature is open to debate.)

Happy New Year!

svn-id: r12062
 2003-12-31 23:32:40 +00:00
Torbjörn Andersson
6899aa23cb I still don't know how to draw the credits like the original did, but at 
least the credits text is showing now.

svn-id: r12053
 2003-12-31 13:14:07 +00:00
Torbjörn Andersson
6ae8218d53 Hopefully the last big renaming. Now the datatypes have names like 
"StandardHeader" instead of "_standardHeader".

svn-id: r11997
 2003-12-28 15:08:12 +00:00
Torbjörn Andersson
5eb38cb380 cleanup 
svn-id: r11364
 2003-11-25 09:05:10 +00:00
Torbjörn Andersson
fa2b8ba8de More cleanup. I've eliminated all the temporary global variables I've added 
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-16 14:18:29 +00:00
Torbjörn Andersson
446a01ba09 Moved low-level keyboard and mouse handling to a new Input class, and 
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-11 07:43:02 +00:00
Torbjörn Andersson
3d012651fd The script engine frequently needs to pass pointers to various structures 
etc. to the different opcodes. Until now it has done so by casting the
pointer to an int32 (opcode parameters are represented as arrays of int32)
and then the opcode function casts it back to whatever pointer it needs.

At least in C there is no guarantee that a pointer can be represented as an
integer type (though apparently C99 may define such a type), so this has
struck me as unsafe ever since I first noticed it.

However, since all such pointers appear to point to the memory block owned
by the memory manager, we can easily convert them to integers by treating
them as offsets into the memory block. So that's what I have done. I hope I
caught all the occurences in the opcode functions, or we're going to have
some pretty interesting regressions on our hands...

svn-id: r11241
 2003-11-10 07:52:15 +00:00
Torbjörn Andersson
9106229bef Removed some now redundant header files. 
svn-id: r11209
 2003-11-08 18:15:35 +00:00
Torbjörn Andersson
688c80b062 Moved more stuff into classes, changed some static allocation to dynamic, 
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-08 15:47:51 +00:00
Torbjörn Andersson
b3b0118292 The resource and memory managers are now created dynamically. 
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-03 07:47:42 +00:00
Paweł Kołodziejski
99447628ac fixed warning 
svn-id: r11069
 2003-11-02 22:38:04 +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
Torbjörn Andersson
94edf540ef More moving of stuff into classes 
svn-id: r11025
 2003-11-01 16:55:20 +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
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
3a43829b88 Moved the opcode functions into the Logic class. 
svn-id: r10885
 2003-10-18 08:11:50 +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
Torbjörn Andersson
a29d128bd3 Use RandomSource instead of rand(). 
svn-id: r10682
 2003-10-08 18:02:53 +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
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
5a074e6137 added namespace Sword2 
svn-id: r10581
 2003-10-04 00:52:27 +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
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
93b8cefe19 Tiny whitespace / comment change. 
svn-id: r10478
 2003-09-29 06:48:48 +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
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
f5d8300043 Really clear the screen during the credits. 
svn-id: r10408
 2003-09-25 13:04:46 +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
3c7c60196f ScummVM code formatting conventions 
svn-id: r10350
 2003-09-21 16:11:26 +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
Torbjörn Andersson
d6c2957d5c cleanup 
svn-id: r10269
 2003-09-17 13:03:13 +00:00
Jonathan Gray
5825a28330 properly close down when playing demo 
svn-id: r9921
 2003-08-30 15:21:51 +00:00
Max Horn
01f020da2b SetPalette conflicts with an OS symbol on OS X 
svn-id: r9829
 2003-08-23 14:42:37 +00:00
James Brown
ec447fdfbb Remove a bunch of unneeded cruft - but barely the surface of it. This code is depressing and duplicated all over the place... I don't think I can bear to touch this code until it's undergone some MAJOR cleanup :) 
svn-id: r9782
 2003-08-19 14:57:26 +00:00
Oliver Kiehl
0f85cc3061 rename bs2 to sword2 to have the same name as the original engine. 
besides this way all our engines start with an "s" ;)

svn-id: r9301
 2003-07-30 19:25:31 +00:00