[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.62,1.63 build_display.cpp,1.64,1.65 console.cpp,1.48,1.49 console.h,1.22,1.23 controls.cpp,1.73,1.74 debug.cpp,1.42,1.43 events.cpp,1.31,1.32 function.cpp,1.68,1.69 icons.cpp,1.36,1.37 interpreter.cpp,1.49,1.50 logic.cpp,1.45,1.46 logic.h,1.37,1.38 memory.cpp,1.31,1.32 mouse.cpp,1.61,1.62 resman.cpp,1.99,1.100 save_rest.cpp,1.57,1.58 sound.cpp,1.46,1.47 speech.cpp,1.66,1.67 startup.cpp,1.43,1.44 sword2.cpp,1.117,1.118 sword2.h,1.65,1.66 walker.cpp,1.40,1.41
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Sun Nov 14 07:02:01 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 mt32emu.h,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra codecs.h,1.2,1.3 cpsimage.cpp,1.2,1.3 font.cpp,1.3,1.4 kyra.cpp,1.10,1.11 kyra.h,1.4,1.5 palette.cpp,1.3,1.4 resource.cpp,1.6,1.7 resource.h,1.4,1.5 script.cpp,1.7,1.8 script.h,1.3,1.4 script_v1.cpp,1.5,1.6 wsamovie.cpp,1.3,1.4 wsamovie.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11398
Modified Files:
anims.cpp build_display.cpp console.cpp console.h controls.cpp
debug.cpp events.cpp function.cpp icons.cpp interpreter.cpp
logic.cpp logic.h memory.cpp mouse.cpp resman.cpp
save_rest.cpp sound.cpp speech.cpp startup.cpp sword2.cpp
sword2.h walker.cpp
Log Message:
Cleanup
Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- anims.cpp 22 Aug 2004 14:27:57 -0000 1.62
+++ anims.cpp 14 Nov 2004 14:59:59 -0000 1.63
@@ -31,6 +31,7 @@
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
#include "sword2/driver/animation.h"
#include "sword2/driver/d_draw.h"
Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- build_display.cpp 28 Sep 2004 20:19:34 -0000 1.64
+++ build_display.cpp 14 Nov 2004 14:59:59 -0000 1.65
@@ -28,6 +28,7 @@
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
#include "sword2/driver/d_draw.h"
Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- console.cpp 28 Sep 2004 20:19:34 -0000 1.48
+++ console.cpp 14 Nov 2004 14:59:59 -0000 1.49
@@ -23,6 +23,7 @@
#include "sword2/console.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
#include "sword2/driver/d_draw.h"
#include "sword2/driver/d_sound.h"
Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- console.h 8 Sep 2004 07:10:54 -0000 1.22
+++ console.h 14 Nov 2004 14:59:59 -0000 1.23
@@ -22,7 +22,6 @@
#include "common/debugger.h"
#include "sword2/debug.h"
-#include "sword2/object.h"
namespace Sword2 {
Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- controls.cpp 28 Sep 2004 20:19:35 -0000 1.73
+++ controls.cpp 14 Nov 2004 14:59:59 -0000 1.74
@@ -25,6 +25,7 @@
#include "sword2/defs.h"
#include "sword2/logic.h"
#include "sword2/resman.h"
+#include "sword2/router.h"
#include "sword2/driver/d_draw.h"
#include "sword2/driver/d_sound.h"
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- debug.cpp 28 Sep 2004 20:19:35 -0000 1.42
+++ debug.cpp 14 Nov 2004 15:00:00 -0000 1.43
@@ -23,7 +23,9 @@
#include "sword2/defs.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/router.h"
#include "sword2/driver/d_draw.h"
namespace Sword2 {
Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/events.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- events.cpp 24 Apr 2004 12:29:35 -0000 1.31
+++ events.cpp 14 Nov 2004 15:00:00 -0000 1.32
@@ -23,6 +23,7 @@
#include "sword2/console.h"
#include "sword2/interpreter.h"
#include "sword2/logic.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
#define Debug_Printf _vm->_debugger->DebugPrintf
Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- function.cpp 19 Oct 2004 07:12:23 -0000 1.68
+++ function.cpp 14 Nov 2004 15:00:00 -0000 1.69
@@ -24,7 +24,9 @@
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/sound.h"
#include "sword2/driver/d_draw.h"
#include "sword2/driver/d_sound.h"
#include "sword2/driver/render.h"
Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/icons.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- icons.cpp 23 Apr 2004 07:01:38 -0000 1.36
+++ icons.cpp 14 Nov 2004 15:00:00 -0000 1.37
@@ -22,6 +22,7 @@
#include "sword2/defs.h"
#include "sword2/interpreter.h"
#include "sword2/logic.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
#include "sword2/driver/d_draw.h"
Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/interpreter.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- interpreter.cpp 11 Nov 2004 15:30:02 -0000 1.49
+++ interpreter.cpp 14 Nov 2004 15:00:00 -0000 1.50
@@ -22,6 +22,7 @@
#include "sword2/sword2.h"
#include "sword2/interpreter.h"
#include "sword2/logic.h"
+#include "sword2/memory.h"
namespace Sword2 {
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- logic.cpp 26 Sep 2004 16:10:21 -0000 1.45
+++ logic.cpp 14 Nov 2004 15:00:00 -0000 1.46
@@ -24,6 +24,7 @@
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/resman.h"
+#include "sword2/router.h"
#define LEVEL (_curObjectHub->logic_level)
@@ -31,6 +32,24 @@
namespace Sword2 {
+Logic::Logic(Sword2Engine *vm) :
+ _vm(vm), _kills(0), _smackerLeadOut(0), _sequenceTextLines(0),
+ _speechTime(0), _animId(0), _speechAnimType(0), _leftClickDelay(0),
+ _rightClickDelay(0), _defaultResponseId(0), _totalStartups(0),
+ _totalScreenManagers(0), _officialTextNumber(0), _speechTextBlocNo(0),
+ _choosing(false) {
+ _scriptVars = NULL;
+ memset(_subjectList, 0, sizeof(_subjectList));
+ memset(_eventList, 0, sizeof(_eventList));
+ memset(_syncList, 0, sizeof(_syncList));
+ _router = new Router(_vm);
+ initStartMenu();
+}
+
+Logic::~Logic() {
+ delete _router;
+}
+
/**
* Do one cycle of the current session.
*/
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- logic.h 8 Sep 2004 07:10:54 -0000 1.37
+++ logic.h 14 Nov 2004 15:00:00 -0000 1.38
@@ -22,9 +22,6 @@
#ifndef _LOGIC
#define _LOGIC
-#include "sword2/header.h"
-#include "sword2/memory.h"
-#include "sword2/router.h"
#include "sword2/speech.h"
#include "sword2/startup.h"
@@ -43,6 +40,7 @@
#define MAX_SEQUENCE_TEXT_LINES 15
class Sword2Engine;
+class Router;
class Logic {
private:
@@ -164,24 +162,8 @@
ObjectMega _engineMega;
public:
- Logic(Sword2Engine *vm) :
- _vm(vm), _kills(0), _smackerLeadOut(0),
- _sequenceTextLines(0), _speechTime(0), _animId(0),
- _speechAnimType(0), _leftClickDelay(0), _rightClickDelay(0),
- _defaultResponseId(0), _totalStartups(0),
- _totalScreenManagers(0), _officialTextNumber(0),
- _speechTextBlocNo(0), _choosing(false) {
- _scriptVars = NULL;
- memset(_subjectList, 0, sizeof(_subjectList));
- memset(_eventList, 0, sizeof(_eventList));
- memset(_syncList, 0, sizeof(_syncList));
- _router = new Router(_vm);
- initStartMenu();
- }
-
- ~Logic() {
- delete _router;
- }
+ Logic(Sword2Engine *vm);
+ ~Logic();
// Point to the global variable data
static uint32 *_scriptVars;
Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/memory.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- memory.cpp 12 Sep 2004 17:05:17 -0000 1.31
+++ memory.cpp 14 Nov 2004 15:00:00 -0000 1.32
@@ -43,6 +43,7 @@
#include "common/stdafx.h"
#include "sword2/sword2.h"
#include "sword2/console.h"
+#include "sword2/memory.h"
namespace Sword2 {
Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mouse.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- mouse.cpp 10 Jun 2004 06:41:08 -0000 1.61
+++ mouse.cpp 14 Nov 2004 15:00:00 -0000 1.62
@@ -25,7 +25,9 @@
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/sound.h"
#include "sword2/driver/d_draw.h"
#include "sword2/driver/d_sound.h"
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- resman.cpp 19 Sep 2004 18:19:30 -0000 1.99
+++ resman.cpp 14 Nov 2004 15:00:00 -0000 1.100
@@ -23,7 +23,9 @@
#include "sword2/console.h"
#include "sword2/defs.h"
#include "sword2/logic.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/router.h"
#include "sword2/driver/d_draw.h"
#define Debug_Printf _vm->_debugger->DebugPrintf
Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- save_rest.cpp 25 Jun 2004 22:39:21 -0000 1.57
+++ save_rest.cpp 14 Nov 2004 15:00:01 -0000 1.58
@@ -31,7 +31,9 @@
#include "sword2/defs.h"
#include "sword2/interpreter.h"
#include "sword2/logic.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/sound.h"
namespace Sword2 {
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sound.cpp 27 Aug 2004 08:31:33 -0000 1.46
+++ sound.cpp 14 Nov 2004 15:00:01 -0000 1.47
@@ -34,6 +34,7 @@
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/resman.h"
+#include "sword2/sound.h"
#include "sword2/driver/d_sound.h"
namespace Sword2 {
Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- speech.cpp 22 Aug 2004 14:27:57 -0000 1.66
+++ speech.cpp 14 Nov 2004 15:00:01 -0000 1.67
@@ -19,6 +19,7 @@
#include "common/stdafx.h"
#include "common/file.h"
+
#include "sword2/sword2.h"
#include "sword2/console.h"
#include "sword2/controls.h"
@@ -26,6 +27,7 @@
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
#include "sword2/driver/d_draw.h"
#include "sword2/driver/d_sound.h"
Index: startup.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/startup.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- startup.cpp 8 Sep 2004 07:10:54 -0000 1.43
+++ startup.cpp 14 Nov 2004 15:00:01 -0000 1.44
@@ -19,13 +19,16 @@
#include "common/stdafx.h"
#include "common/file.h"
+
#include "sword2/sword2.h"
#include "sword2/console.h"
#include "sword2/defs.h"
#include "sword2/interpreter.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/router.h"
#include "sword2/driver/d_sound.h"
#define Debug_Printf _vm->_debugger->DebugPrintf
Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- sword2.cpp 12 Oct 2004 17:03:04 -0000 1.117
+++ sword2.cpp 14 Nov 2004 15:00:01 -0000 1.118
@@ -23,13 +23,16 @@
#include "base/plugins.h"
#include "common/config-manager.h"
#include "common/file.h"
+
#include "sword2/sword2.h"
#include "sword2/console.h"
#include "sword2/controls.h"
#include "sword2/defs.h"
#include "sword2/logic.h"
#include "sword2/maketext.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/sound.h"
#include "sword2/driver/d_draw.h"
#include "sword2/driver/d_sound.h"
Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- sword2.h 8 Sep 2004 07:10:54 -0000 1.65
+++ sword2.h 14 Nov 2004 15:00:01 -0000 1.66
@@ -28,18 +28,15 @@
#define RIGHT_CLICK_CLEARS_LUGGAGE 0
#include "base/engine.h"
-#include "common/util.h"
#include "sword2/driver/driver96.h"
#include "sword2/build_display.h"
#include "sword2/header.h"
#include "sword2/icons.h"
#include "sword2/layers.h"
-#include "sword2/memory.h"
#include "sword2/mouse.h"
#include "sword2/object.h"
#include "sword2/save_rest.h"
-#include "sword2/sound.h"
class GameDetector;
@@ -49,6 +46,7 @@
GF_DEMO = 1 << 0
};
+class MemoryManager;
class ResourceManager;
class Sound;
class Graphics;
Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/walker.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- walker.cpp 30 Oct 2004 21:58:37 -0000 1.40
+++ walker.cpp 14 Nov 2004 15:00:01 -0000 1.41
@@ -27,7 +27,9 @@
#include "sword2/defs.h"
#include "sword2/interpreter.h"
#include "sword2/logic.h"
+#include "sword2/memory.h"
#include "sword2/resman.h"
+#include "sword2/router.h"
#include "sword2/driver/d_draw.h"
namespace Sword2 {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi/mt32 mt32emu.h,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/kyra codecs.h,1.2,1.3 cpsimage.cpp,1.2,1.3 font.cpp,1.3,1.4 kyra.cpp,1.10,1.11 kyra.h,1.4,1.5 palette.cpp,1.3,1.4 resource.cpp,1.6,1.7 resource.h,1.4,1.5 script.cpp,1.7,1.8 script.h,1.3,1.4 script_v1.cpp,1.5,1.6 wsamovie.cpp,1.3,1.4 wsamovie.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list