2005-01-17 10:57:15 +00:00
|
|
|
/* Copyright (C) 1994-1998 Revolution Software Ltd.
|
|
|
|
* Copyright (C) 2003-2005 The ScummVM project
|
2003-07-28 01:44:38 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*
|
|
|
|
* $Header$
|
|
|
|
*/
|
|
|
|
|
2003-11-16 14:18:29 +00:00
|
|
|
#include "common/stdafx.h"
|
2003-11-18 08:17:36 +00:00
|
|
|
#include "common/file.h"
|
2004-11-14 15:00:01 +00:00
|
|
|
|
2003-11-16 14:18:29 +00:00
|
|
|
#include "sword2/sword2.h"
|
2004-09-08 07:10:54 +00:00
|
|
|
#include "sword2/defs.h"
|
2004-02-05 14:19:07 +00:00
|
|
|
#include "sword2/logic.h"
|
|
|
|
#include "sword2/maketext.h"
|
2004-11-14 15:00:01 +00:00
|
|
|
#include "sword2/memory.h"
|
2004-02-05 14:19:07 +00:00
|
|
|
#include "sword2/resman.h"
|
2004-11-14 15:00:01 +00:00
|
|
|
#include "sword2/router.h"
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
#include "sword2/sound.h"
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-10-04 00:52:27 +00:00
|
|
|
namespace Sword2 {
|
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
bool Sword2Engine::initStartMenu() {
|
2003-09-20 17:00:14 +00:00
|
|
|
// Print out a list of all the start points available.
|
|
|
|
// There should be a linc produced file called startup.txt.
|
|
|
|
// This file should contain ascii numbers of all the resource game
|
|
|
|
// objects that are screen managers.
|
|
|
|
// We query each in turn and setup an array of start structures.
|
|
|
|
// If the file doesn't exist then we say so and return a 0.
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2005-05-10 22:56:25 +00:00
|
|
|
Common::File fp;
|
2003-11-18 08:17:36 +00:00
|
|
|
|
2003-09-20 17:00:14 +00:00
|
|
|
// ok, load in the master screen manager file
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
_totalStartups = 0;
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_totalScreenManagers = 0;
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-11-18 08:17:36 +00:00
|
|
|
if (!fp.open("startup.inf")) {
|
2004-04-27 08:59:58 +00:00
|
|
|
warning("Cannot open startup.inf - the debugger won't have a start menu");
|
|
|
|
return false;
|
2003-07-28 01:44:38 +00:00
|
|
|
}
|
|
|
|
|
2003-11-18 08:17:36 +00:00
|
|
|
// The startup.inf file which contains a list of all the files. Now
|
|
|
|
// extract the filenames
|
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
int start_ids[MAX_starts];
|
|
|
|
|
2003-11-18 08:17:36 +00:00
|
|
|
while (1) {
|
|
|
|
bool done = false;
|
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
start_ids[_totalScreenManagers] = 0;
|
|
|
|
|
|
|
|
// Scan the string until the LF in CRLF
|
|
|
|
|
|
|
|
int b;
|
|
|
|
|
|
|
|
do {
|
|
|
|
b = fp.readByte();
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-11-18 08:17:36 +00:00
|
|
|
if (fp.ioFailed()) {
|
|
|
|
done = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
if (isdigit(b)) {
|
|
|
|
start_ids[_totalScreenManagers] *= 10;
|
|
|
|
start_ids[_totalScreenManagers] += (b - '0');
|
2003-11-18 08:17:36 +00:00
|
|
|
}
|
2004-04-27 08:59:58 +00:00
|
|
|
} while (b != 10);
|
2003-09-20 17:00:14 +00:00
|
|
|
|
2003-11-18 08:17:36 +00:00
|
|
|
if (done)
|
|
|
|
break;
|
|
|
|
|
2003-11-04 18:02:49 +00:00
|
|
|
_totalScreenManagers++;
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-11-04 18:02:49 +00:00
|
|
|
if (_totalScreenManagers == MAX_starts) {
|
2004-04-27 08:59:58 +00:00
|
|
|
warning("MAX_starts exceeded");
|
2003-07-28 01:44:38 +00:00
|
|
|
break;
|
|
|
|
}
|
2003-11-18 08:17:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fp.close();
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// Using this method the Gode generated resource.inf must have #0d0a
|
2003-09-20 17:00:14 +00:00
|
|
|
// on the last entry
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
debug(1, "%d screen manager objects", _totalScreenManagers);
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-09-20 17:00:14 +00:00
|
|
|
// Open each object and make a query call. The object must fill in a
|
|
|
|
// startup structure. It may fill in several if it wishes - for
|
|
|
|
// instance a startup could be set for later in the game where
|
|
|
|
// specific vars are set
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-11-18 08:17:36 +00:00
|
|
|
for (uint i = 0; i < _totalScreenManagers; i++) {
|
2004-04-27 08:59:58 +00:00
|
|
|
_startRes = start_ids[i];
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
debug(2, "Querying screen manager %d", _startRes);
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// Open each one and run through the interpreter. Script 0 is
|
|
|
|
// the query request script
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-09-20 17:00:14 +00:00
|
|
|
// if the resource number is within range & it's not a null
|
2003-11-04 18:02:49 +00:00
|
|
|
// resource
|
2003-09-20 17:00:14 +00:00
|
|
|
// - need to check in case un-built sections included in
|
|
|
|
// start list
|
2003-07-28 01:44:38 +00:00
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
if (_resman->checkValid(_startRes)) {
|
2005-05-12 13:12:15 +00:00
|
|
|
char *raw_script = (char *)_resman->openResource(_startRes);
|
2004-04-27 08:59:58 +00:00
|
|
|
uint32 null_pc = 0;
|
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_logic->runScript(raw_script, raw_script, &null_pc);
|
|
|
|
_resman->closeResource(_startRes);
|
2003-09-20 17:00:14 +00:00
|
|
|
} else
|
2004-04-27 08:59:58 +00:00
|
|
|
warning("Start menu resource %d invalid", _startRes);
|
2003-07-28 01:44:38 +00:00
|
|
|
}
|
|
|
|
|
2003-09-20 17:00:14 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2003-07-28 01:44:38 +00:00
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
void Sword2Engine::registerStartPoint(int32 key, char *name) {
|
2004-04-27 08:59:58 +00:00
|
|
|
assert(_totalStartups < MAX_starts);
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-11-04 18:02:49 +00:00
|
|
|
_startList[_totalStartups].start_res_id = _startRes;
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_startList[_totalStartups].key = key;
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
strncpy(_startList[_totalStartups].description, name, MAX_description);
|
|
|
|
_startList[_totalStartups].description[MAX_description - 1] = 0;
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2003-11-04 18:02:49 +00:00
|
|
|
_totalStartups++;
|
2003-07-28 01:44:38 +00:00
|
|
|
}
|
|
|
|
|
2005-02-22 07:37:50 +00:00
|
|
|
void Sword2Engine::runStart(int start) {
|
2004-04-27 08:59:58 +00:00
|
|
|
// Restarting - stop sfx, music & speech!
|
2003-09-20 17:00:14 +00:00
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_sound->clearFxQueue();
|
|
|
|
_logic->fnStopMusic(NULL);
|
|
|
|
_sound->unpauseSpeech();
|
|
|
|
_sound->stopSpeech();
|
2003-09-20 17:00:14 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// Remove all resources from memory, including player object and global
|
|
|
|
// variables
|
2003-09-20 17:00:14 +00:00
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_resman->removeAll();
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-09-08 07:10:54 +00:00
|
|
|
// Reopen global variables resource and player object
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
setupPersistentResources();
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// Free all the route memory blocks from previous game
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_logic->_router->freeAllRouteMem();
|
2003-09-20 17:00:14 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// If there was speech text, kill the text block
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
if (_logic->_speechTextBlocNo) {
|
|
|
|
_fontRenderer->killTextBloc(_logic->_speechTextBlocNo);
|
|
|
|
_logic->_speechTextBlocNo = 0;
|
2004-04-27 08:59:58 +00:00
|
|
|
}
|
2003-09-20 17:00:14 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// Open George
|
2005-05-12 13:12:15 +00:00
|
|
|
char *raw_data_ad = (char *)_resman->openResource(CUR_PLAYER_ID);
|
|
|
|
char *raw_script = (char *)_resman->openResource(_startList[start].start_res_id);
|
2003-07-28 01:44:38 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// Denotes script to run
|
|
|
|
uint32 null_pc = _startList[start].key & 0xffff;
|
2003-07-28 01:44:38 +00:00
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_logic->runScript(raw_script, raw_data_ad, &null_pc);
|
2003-07-28 01:44:38 +00:00
|
|
|
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_resman->closeResource(_startList[start].start_res_id);
|
|
|
|
_resman->closeResource(CUR_PLAYER_ID);
|
2003-09-20 17:00:14 +00:00
|
|
|
|
2004-04-27 08:59:58 +00:00
|
|
|
// Make sure there's a mouse, in case restarting while mouse not
|
|
|
|
// available
|
Began what I hope is the final major restructuring of the BS2 engine.
In this first step, I have moved all opcode functions into functions.cpp,
instead of having them scattered all over the place.
To get things to compile again, I had to rewrite the overly complicated
sound effects handling. It's much simpler now.
The next step will be to move any non-trivial code out of the opcode
functions and into the appropriate object. This, I hope, will make it
easier to create well-separated objects, instead of the current mess.
I also want to tear down the artificial boundary between the main directory
and the "driver" directory. We already have a cross-platform layer; there's
no need to have yet another one. (Actually, the rewriting of the sound
effects code took one first step in this direction.)
At the final stage, I'd like to get rid of the "drivers" directory
completely, but I'll probably need some help with that if I want to
preserve the CVS history of the code.
Things will probably be a bit bumpy along the way, but I seem to have
reached a point of relative stability again, which is why I'm commiting
this now.
svn-id: r16668
2005-01-28 16:33:14 +00:00
|
|
|
_logic->fnAddHuman(NULL);
|
2003-09-20 17:00:14 +00:00
|
|
|
}
|
2003-10-04 00:52:27 +00:00
|
|
|
|
|
|
|
} // End of namespace Sword2
|