diff options
| author | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
| commit | d4c92983920cfe3b25a22d91e12c750e591b917e (patch) | |
| tree | c0b63318b9ba0e67528337cfaa21515def1c3962 /engines/sword2/sword2.cpp | |
| parent | 7e2edf16b3e2bf1d2b31999979a60802514df6cb (diff) | |
| parent | cf107e24be28c7e6db65b5c7ffed120af4a7994b (diff) | |
| download | scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.gz scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.bz2 scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sword2/sword2.cpp')
| -rw-r--r-- | engines/sword2/sword2.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index 58f3547ff7..47c9b1616e 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -20,9 +20,6 @@ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ */ #include "base/plugins.h" @@ -31,7 +28,6 @@ #include "common/file.h" #include "common/fs.h" #include "common/events.h" -#include "common/EventRecorder.h" #include "common/savefile.h" #include "common/system.h" #include "common/textconsole.h" @@ -255,7 +251,7 @@ Common::Error Sword2MetaEngine::createInstance(OSystem *syst, Engine **engine) c namespace Sword2 { -Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst) { +Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst), _rnd("sword2") { // Add default file directories const Common::FSNode gameDataDir(ConfMan.get("path")); SearchMan.addSubDirectoryMatching(gameDataDir, "clusters"); @@ -295,8 +291,6 @@ Sword2Engine::Sword2Engine(OSystem *syst) : Engine(syst) { _gameSpeed = 1; _gmmLoadSlot = -1; // Used to manage GMM Loading - - g_eventRec.registerRandomSource(_rnd, "sword2"); } Sword2Engine::~Sword2Engine() { |