From 24265fd3dd1681835f63e3c901158adef1ec5bc5 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Fri, 19 Aug 2005 22:12:09 +0000
Subject: some WIP code to start introduction (with glitches) in Kyrandia 1 : -
 the decoders have been rewritten due to crashes I encountered with the
 previous ones in Compression:: - the wsa code loader for v1 have been
 rewritten too, to handle the same flags as the original - some cleanup - this
 has only been tested with the floppy version

svn-id: r18704
---
 kyra/script.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'kyra/script.cpp')

diff --git a/kyra/script.cpp b/kyra/script.cpp
index 5a52aca711..358d65b1bb 100644
--- a/kyra/script.cpp
+++ b/kyra/script.cpp
@@ -20,13 +20,12 @@
  */
 
 #include "common/stdafx.h"
+#include "common/stream.h"
+#include "common/util.h"
 #include "kyra/kyra.h"
 #include "kyra/script.h"
 #include "kyra/resource.h"
 
-#include "common/stream.h"
-#include "common/util.h"
-
 #define COMMAND(x) { &VMContext::x, #x }
 #define OPCODE(x) { &VMContext::x, #x }
 
@@ -402,7 +401,7 @@ void VMContext::loadScript(const char* file) {
 	memset(_stack, 0, sizeof(int32) * ARRAYSIZE(_stack));
 
 	// loads the new file
-	_scriptFile = _engine->resManager()->fileData(file, &_scriptFileSize);
+	_scriptFile = _engine->resource()->fileData(file, &_scriptFileSize);
 
 	if (!_scriptFileSize || !_scriptFile) {
 		error("couldn't load script file '%s'", file);
-- 
cgit v1.2.3