[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.19,1.20 logic.cpp,1.8,1.9 logic.h,1.3,1.4
Oliver Kiehl
olki at users.sourceforge.net
Sat Apr 26 04:10:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv26539
Modified Files:
sky.cpp logic.cpp logic.h
Log Message:
link to removeObjectFromWalk and objectToWalk
Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sky.cpp 25 Apr 2003 23:14:40 -0000 1.19
+++ sky.cpp 26 Apr 2003 11:09:20 -0000 1.20
@@ -117,7 +117,7 @@
//initialiseRouter();
_skyText = getSkyText();
_grid = new SkyGrid(_skyDisk);
- _skyLogic = new SkyLogic(_skyDisk);
+ _skyLogic = new SkyLogic(_skyDisk, _grid);
}
void SkyState::initItemList() {
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- logic.cpp 26 Apr 2003 09:43:48 -0000 1.8
+++ logic.cpp 26 Apr 2003 11:09:20 -0000 1.9
@@ -47,7 +47,6 @@
&SkyLogic::simpleAnim, // 16 Module anim without x,y's
};
-
void SkyLogic::engine() {
#define logic_list_no 141
Compact *compact2 = SkyState::fetchCompact(141); // logic list
@@ -70,15 +69,13 @@
// ok, here we process the logic bit system
if (_compact->status & (1 << 7))
- warning("remove_object_from_walk unimplemented");
- // remove_object_from_walk();
+ _grid->removeObjectFromWalk(_compact);
SkyDebug::logic(_compact->logic);
(this->*logicTable[_compact->logic]) ();
if (_compact->status & (1 << 7))
- warning("object_to_walk unimplemented");
- // object_to_walk();
+ _grid->objectToWalk(_compact);
// a sync sent to the compact is available for one cycle
// only. that cycle has just ended so remove the sync.
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- logic.h 25 Apr 2003 18:26:41 -0000 1.3
+++ logic.h 26 Apr 2003 11:09:20 -0000 1.4
@@ -24,10 +24,11 @@
#include "sky/sky.h"
#include "sky/disk.h"
+#include "sky/grid.h"
class SkyLogic {
public:
- SkyLogic(SkyDisk *skyDisk) : _skyDisk(skyDisk) { initScriptVariables(); };
+ SkyLogic(SkyDisk *skyDisk, SkyGrid *grid) : _skyDisk(skyDisk), _grid(grid) { initScriptVariables(); };
void engine();
void lreturn();
@@ -176,6 +177,7 @@
uint32 _scriptVariables[838];
SkyDisk *_skyDisk;
+ SkyGrid *_grid;
};
#endif
More information about the Scummvm-git-logs
mailing list