aboutsummaryrefslogtreecommitdiff
path: root/sword2
AgeCommit message (Collapse)Author
2003-12-17Made sure that *all* AudioInputStream 'know' their sample rate; removed ↵Max Horn
pointless MusicStream class; removed various specific Channel subclasses and instead generalized the base class some more svn-id: r11699
2003-12-15Tiny whitespace change. (No, as a matter of fact I don't have anythingTorbjörn Andersson
better to do. :-) svn-id: r11649
2003-12-14Mostly cleanups, but I believe this also fixes an endian problem in theTorbjörn Andersson
"restart script" opcode. To actually verify this, though, I'd need to find a case where any other script than script 0 at offset 0 is restarted... svn-id: r11638
2003-12-14Fixed a potential crash bug where an audio buffer would be freed at the endTorbjörn Andersson
of an animated cutscene while the mixer was still using it. Oddly enough, I didn't encounter this bug when I played through the game recently, but today it happened every time at the end of the cutscene where Nico finds the jaguar stone. svn-id: r11637
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-11cleanupTorbjörn Andersson
svn-id: r11581
2003-12-10Restored some relevant information to a comment that was removed by myTorbjörn Andersson
previous commit. svn-id: r11551
2003-12-10Sprite surfaces (as opposed to standard sprites) are always displayTorbjörn Andersson
aligned, never flipped and never RLE16-compressed. Simplified the code accordingly. (Displaying the restore dialog when specifying an unused save slot from the command-line works again now.) Plus some minor cleanups. svn-id: r11550
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-09I've played through the whole game, and I've scanned through the clusterTorbjörn Andersson
files with a primitive and incomplete tool to present resource information. (It may evolve into something useful and/or presentable later. Much later.) I've found no evidence whatsoever that the mysterious blend & 0x02 case is ever used. Since the code makes no sense to me, I've removed it. svn-id: r11538
2003-12-08Shut up Valgrind warnings.Torbjörn Andersson
svn-id: r11528
2003-12-03Change Broken Sword 2 default to no subtitlesTravis Howell
To match original version and other games. svn-id: r11479
2003-12-02Since all other engines have been changed to use "subtitles" instead ofTorbjörn Andersson
"nosubtitles", let's change this one as well. Of course, it does break compatibility with old config files, but I guess the worst that can happen is that we have an unused "nosubtitles" line in addition to the used "subtitles" line... svn-id: r11464
2003-12-02cleanupTorbjörn Andersson
svn-id: r11457
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-29Clarified comment about the elevator script bug and added a workaround forTorbjörn Andersson
the dreaded Pyramid Bug. svn-id: r11427
2003-11-28Some formatting changes, and a few debug message corrections.Torbjörn Andersson
svn-id: r11384
2003-11-27Mostly whitespace changes, but also a few modifications to the stillTorbjörn Andersson
experimental resource dumping code. svn-id: r11382
2003-11-25Removed some spurious semi-colons pointed out in patch #847464Torbjörn Andersson
svn-id: r11366
2003-11-25Removed extra bars/node stuff since it was never used. From what ITorbjörn Andersson
understand the idea was to allow moving objects to take up space in the scene, thus forcing actors to move around them, or something like that. However, the number of extra bars/nodes was always zero. svn-id: r11365
2003-11-25cleanupTorbjörn Andersson
svn-id: r11364
2003-11-25More cleanup. Another unused file bites the dust.Torbjörn Andersson
svn-id: r11363
2003-11-24Removed redundant information from the opcode list. I thought having theTorbjörn Andersson
number of parameters to a function would be useful for debugging, but that information is already available in the script data itself. svn-id: r11360
2003-11-23Added experimental (i.e. not tested) resource dumping code.Torbjörn Andersson
Added tentative workaround for the bug (a script bug, I think) that causes the game to hang when examining the lift at the top of the pyramid. And, of course, some misc. cleanup. svn-id: r11359
2003-11-19Eliminated some more references to g_sword2. I think the only thing thatTorbjörn Andersson
still uses it are the engine's global variables which, on the other hand, are used *everywhere*. I'll have to think some more about those. I guess I should take a closer look at how the other engines handle them. (That goes for a lot of things by the way.) svn-id: r11349
2003-11-18Removed unused file.Torbjörn Andersson
svn-id: r11343
2003-11-18The readFile() function was only used once, for creating the debugger startTorbjörn Andersson
menu, and wasn't even necessary there so I've removed it. That means the tony_gsdk.cpp file is no longer necessary. Sorry Tony, but at least you still have your own debugger command! ;-) svn-id: r11342
2003-11-16fix compilation on big endian systemsMax Horn
svn-id: r11318
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-14cleanupTorbjörn Andersson
svn-id: r11290
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-12cleanupTorbjörn Andersson
svn-id: r11266
2003-11-11Slight refinement to the last patch. There are four different possibilitiesTorbjörn Andersson
for which CD to look for: 0 (both CDs - not used?), 1, 2 and 3 (not used?) svn-id: r11263
2003-11-11Extended the "res" debugger command to print information about where theTorbjörn Andersson
game expects to find the various cluster files. I plan to look into making the game playable from CD, and this should help during the testing. svn-id: r11262
2003-11-11Removed SVM_timeGetTime(). We may as well call get_msecs() directly.Torbjörn Andersson
svn-id: r11260
2003-11-11Removed redundant header files.Torbjörn Andersson
svn-id: r11259
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-10The script engine frequently needs to pass pointers to various structuresTorbjörn Andersson
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-10cut down on unnecessary GameDetector referencesMax Horn
svn-id: r11239
2003-11-08cleanup whitespacesPaweł Kołodziejski
svn-id: r11212
2003-11-08This one can go as wellTorbjörn Andersson
svn-id: r11210
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-07missed oneJonathan Gray
svn-id: r11177
2003-11-07spelling fixesJonathan Gray
svn-id: r11175
2003-11-05setup opcode table *before* using it to avoid crashes :-)Max Horn
svn-id: r11156
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