ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,586 Commits 45 Branches 139 Tags
23dbd0de994ebfc97c65ab9deb96b052d1983426
Commit Graph
50 Commits
Author SHA1 Message Date
Torbjörn Andersson 4c3a68027f Use the same syntax for accessing script variables as BS1 does, i.e. now 
it's Logic::_scriptVars[ID] instead of just ID. Apart from looking cool, it
makes it much easier to tell the difference between variables and constants
when looking at the code.

Of course, this sort of sweeping changes is jolly good for introducing
truly weird regressions, which is why I waited until after 0.6.0.

svn-id: r13331
 2004-03-17 09:03:15 +00:00
Torbjörn Andersson ece97788ac If the user has previous savegames, display a restart/restore dialog when 
the game starts. (I know it could look prettier, but I don't have much to
work with here...)

svn-id: r13178
 2004-03-04 08:03:32 +00:00
Torbjörn Andersson 802a301a16 Removed some of the #includes from sword2.h 
svn-id: r12739
 2004-02-05 14:19:07 +00:00
Paweł Kołodziejski 2c3dd03d26 fix warnings 
svn-id: r12504
 2004-01-18 20:57:46 +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 14acddb167 Update a comment to reflect that some functions have different names now. 
svn-id: r12140
 2004-01-04 14:59:36 +00:00
Torbjörn Andersson c1cddedca8 Fixed bug that made ScummVM crash when loading a savegame where the main 
character was walking. (I had missed a case where pointers were cast to
integers.)

svn-id: r12113
 2004-01-03 15:52:05 +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 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
Max Horn b5d3add003 fix compilation on big endian systems 
svn-id: r11318
 2003-11-16 23:35:00 +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 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 ba098a3a5b Create g_logic dynamically. More moving of stuff into classes. 
svn-id: r11129
 2003-11-04 18:02:49 +00:00
Max Horn 6e60d7b827 fix compile error 
svn-id: r11107
 2003-11-03 17:46:55 +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 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
Max Horn 2fef2dcb84 bs2 -> sword2 
svn-id: r10997
 2003-10-28 19:51:30 +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 3be2f0f1e0 Moved some more stuff into the Logic class. 
svn-id: r10923
 2003-10-21 08:54:50 +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
Max Horn 31ba12c800 some more target<->game cleanup 
svn-id: r10769
 2003-10-12 19:10:17 +00:00
Torbjörn Andersson 1b52e11d55 Moved the "router" code into a new Router class. I'm hoping this is 
analogous to the SkyAutoRoute class.

svn-id: r10754
 2003-10-12 14:40:04 +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 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 3c7c60196f ScummVM code formatting conventions 
svn-id: r10350
 2003-09-21 16:11:26 +00:00
Torbjörn Andersson ffce9177d0 The usual cleanup, plus make sure to delete SaveFileManager if 
open_savefile() fails.

svn-id: r10339
 2003-09-20 17:48:53 +00:00
Torbjörn Andersson 058273ed7c The 'colliding' flag is never set to anything else than zero, so it should 
be safe to remove it. (I'll remove it completely soon, but I'll start here
to avoid compilation errors.)

svn-id: r10331
 2003-09-20 12:26:55 +00:00
Oliver Kiehl ffd39dc95a if saveslot specified with -x doesn't exist, show restore menu 
svn-id: r10256
 2003-09-14 21:45:42 +00:00
Max Horn 30e4785896 simplified code 
svn-id: r10245
 2003-09-13 21:20:05 +00:00
Max Horn 7eb758f697 I am not happy at all with the slack our team has shown recently! I barely concealed these obvious mistakes, to check who's paying attention. And only one person (olki) did notice, and even he only got 50%... tsk tsk tsk, how shall this go on. What will happen if I make real mistakes instead of purposeful ones? *cough cough* yeah, right 
svn-id: r10240
 2003-09-13 19:26:44 +00:00
Max Horn 2afc2c0ca9 fix global vars storing 
svn-id: r10237
 2003-09-13 18:18:02 +00:00
Max Horn 54a6946eee cleanup 
svn-id: r10235
 2003-09-13 17:36:53 +00:00
Max Horn 059781c80a fix g_header -> header in comments 
svn-id: r10225
 2003-09-13 13:20:28 +00:00
Max Horn d2e56ed4a2 endian conversion in save/restore code (may not be complete, beware!) 
svn-id: r10223
 2003-09-13 13:04:55 +00:00
Jonathan Gray 4df7dd406f fix a resman method and make saving work using SaveFileManager 
svn-id: r9828
 2003-08-23 14:33:57 +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
Max Horn 2ef51278b2 fix shadow warning 
svn-id: r9244
 2003-07-28 11:56:34 +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 71a9b1bc2d rename _mkdir 
svn-id: r9232
 2003-07-28 07:36:27 +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