aboutsummaryrefslogtreecommitdiff
path: root/sword2/function.cpp
AgeCommit message (Collapse)Author
2003-11-25cleanupTorbjörn Andersson
svn-id: r11364
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-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-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-03The resource and memory managers are now created dynamically.Torbjörn Andersson
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-02fixed warningPaweł Kołodziejski
svn-id: r11069
2003-11-02Moved some more "homeless" functions into Sword2Engine. (Don't worry -- ITorbjörn Andersson
promise I will get rid of g_sword2 later.) svn-id: r11057
2003-11-02More moving of stuff into classes. I had to make a few changes/cleanups toTorbjörn Andersson
events.cpp, so there could be regressions. svn-id: r11053
2003-11-01More moving of stuff into classesTorbjörn Andersson
svn-id: r11025
2003-10-29Use the ScummVM config manager instead of a separate BS2-specific configTorbjörn Andersson
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-28bs2 -> sword2Max Horn
svn-id: r10997
2003-10-28cleanup: removed version/id from GameSettingsMax Horn
svn-id: r10995
2003-10-26Enable the debug console. Actually, what I've done is to adapt the debugTorbjörn Andersson
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-18Moved the opcode functions into the Logic class.Torbjörn Andersson
svn-id: r10885
2003-10-15Dumped most of the remaining "driver" code into a new "Display" class. ThisTorbjörn Andersson
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-08Use RandomSource instead of rand().Torbjörn Andersson
svn-id: r10682
2003-10-07Some cleanup, some code removal and some unstubbing. Nothing important.Torbjörn Andersson
svn-id: r10659
2003-10-04Changed to use #include "bs2/..." and removed the inclusion of standard CTorbjörn Andersson
headers. Most (all?) of the ones we need should probably come from stdafx.h instead. svn-id: r10588
2003-10-04added namespace Sword2Max Horn
svn-id: r10581
2003-10-01ScummVM naming conventions and cleanup in the Sword2Sound class.Torbjörn Andersson
svn-id: r10514
2003-09-30Changed the resource manager object to use more ScummVM-like naming.Torbjörn Andersson
svn-id: r10499
2003-09-30Changed the "logic" object to use ScummVM naming conventions.Torbjörn Andersson
svn-id: r10496
2003-09-29Tiny whitespace / comment change.Torbjörn Andersson
svn-id: r10478
2003-09-27Save enough information about the currently playing music before theTorbjörn Andersson
credits so that it can be properly resumed afterwards. svn-id: r10429
2003-09-27More cleanup, and I've replaced most - not quite all - of BS2's debugTorbjörn Andersson
message functions with our own. We still need to go through them and assign sensible debug levels to them. svn-id: r10422
2003-09-26Some more reformatting / cleanup, and removal of comments that did nothingTorbjörn Andersson
but say who added what when. (No disrespect intended, but this information means very little to us.) svn-id: r10413
2003-09-25Really clear the screen during the credits.Torbjörn Andersson
svn-id: r10408
2003-09-23Changed the keyboard handling to store "keyboard events", rather than justTorbjörn Andersson
characters. Hopefully this will make things work smoother on the Mac, but I have no way of testing that. svn-id: r10376
2003-09-23Since we probably won't have anything like the original BS2 launcher menu,Torbjörn Andersson
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-21ScummVM code formatting conventionsTorbjörn Andersson
svn-id: r10350
2003-09-17added a static method setDefaultDirectory to class File; used this to ↵Max Horn
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-17cleanupTorbjörn Andersson
svn-id: r10269
2003-08-30properly close down when playing demoJonathan Gray
svn-id: r9921
2003-08-23SetPalette conflicts with an OS symbol on OS XMax Horn
svn-id: r9829
2003-08-19Remove a bunch of unneeded cruft - but barely the surface of it. This code ↵James Brown
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-07-30rename bs2 to sword2 to have the same name as the original engine.Oliver Kiehl
besides this way all our engines start with an "s" ;) svn-id: r9301
2003-07-29turn d_sound.cpp into class BS2SoundJonathan Gray
svn-id: r9280
2003-07-28rename _DEBUG define to _BS2_DEBUG to stop it conflicting with VCJonathan Gray
svn-id: r9237
2003-07-28Compiles on mingw nowTravis Howell
svn-id: r9222
2003-07-28bs2Jonathan Gray
svn-id: r9211