libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-09 04:16:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,120 Commits 6 Branches 5 Tags
Commit Graph

40 Commits

Author SHA1 Message Date
Torbjörn Andersson
802a301a16 Removed some of the #includes from sword2.h 
svn-id: r12739
 2004-02-05 14:19:07 +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
7c9d46765b Removed some unnecessary / commented out code, and initialized the debug 
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-12-01 07:47:54 +00:00
Torbjörn Andersson
6f23e2c211 Mostly whitespace changes, but also a few modifications to the still 
experimental resource dumping code.

svn-id: r11382
 2003-11-27 07:34:19 +00:00
Torbjörn Andersson
083c328077 Eliminated some more references to g_sword2. I think the only thing that 
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-19 18:40:53 +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
aaa5631a99 Mostly cleanup. Also prevented what would probably have been an infinite 
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-15 09:38:00 +00:00
Torbjörn Andersson
1f53624d88 Removed SVM_timeGetTime(). We may as well call get_msecs() directly. 
svn-id: r11260
 2003-11-11 10:30:25 +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
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
ba098a3a5b Create g_logic dynamically. More moving of stuff into classes. 
svn-id: r11129
 2003-11-04 18:02:49 +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
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
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
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
Max Horn
2fef2dcb84 bs2 -> sword2 
svn-id: r10997
 2003-10-28 19:51:30 +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
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
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
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
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
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
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
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
5bf1974a08 Our ServiceWindows() never returns RDERR_APPCLOSED, and we always behave as 
if we have the focus, so there's no need to check.

svn-id: r10130
 2003-09-09 12:45:33 +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
Jonathan Gray
ce42f4d3dd patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree 
svn-id: r9807
 2003-08-21 13:39:21 +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
Jonathan Gray
f22cca2be2 rename _DEBUG define to _BS2_DEBUG to stop it conflicting with VC 
svn-id: r9237
 2003-07-28 09:49:46 +00:00
Jonathan Gray
ea5822ed23 it would be nice if people would update functions when adding qualifiers to prototypes 
svn-id: r9227
 2003-07-28 05:30:42 +00:00
Travis Howell
ccc40eecc9 Compiles on mingw now 
svn-id: r9222
 2003-07-28 03:12:49 +00:00
Jonathan Gray
f020d28b5e bs2 
svn-id: r9211
 2003-07-28 01:44:38 +00:00