[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.45,1.46 logic.h,1.14,1.15 skydefs.h,1.15,1.16 text.cpp,1.22,1.23
Oliver Kiehl
olki at users.sourceforge.net
Mon May 26 10:42:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv971
Modified Files:
logic.cpp logic.h skydefs.h text.cpp
Log Message:
some additions
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- logic.cpp 26 May 2003 14:45:10 -0000 1.45
+++ logic.cpp 26 May 2003 17:41:18 -0000 1.46
@@ -25,7 +25,7 @@
#include "sky/compact.h"
#include "sky/skydefs.h"
-uint16 SkyLogic::_screen;
+uint32 SkyLogic::_scriptVariables[838];
typedef void (SkyLogic::*LogicTable) ();
static const LogicTable logicTable[] = {
@@ -174,8 +174,10 @@
// fine because the later collision will almost certainly
// take longer to clear than the earlier one.
- if (collide(SkyState::fetchCompact(_compact->extCompact->waitingFor)))
- error("stop_and_wait not implemented\n");
+ if (collide(SkyState::fetchCompact(_compact->extCompact->waitingFor))) {
+ stopAndWait();
+ return;
+ }
// we are not in fact hitting this person so clr & continue
// it must have registered some time ago
@@ -609,6 +611,19 @@
script((uint16)(getOff & 0xffff), (uint16)(getOff >> 16));
}
+void SkyLogic::stopAndWait() {
+ _compact->mode += 4;
+
+ uint16 *scriptNo = (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode);
+ uint16 *offset = (uint16 *)SkyCompact::getCompactElem(_compact, C_BASE_SUB + _compact->mode + 2);
+
+ *scriptNo = (uint16)(_compact->extCompact->stopScript & 0xffff);
+ *offset = (uint16)(_compact->extCompact->stopScript >> 16);
+
+ _compact->logic = L_SCRIPT;
+ logicScript();
+}
+
void SkyLogic::checkModuleLoaded(uint16 moduleNo) {
if (!_moduleList[moduleNo])
_moduleList[moduleNo] = (uint16 *)_skyDisk->loadFile((uint16)moduleNo + F_MODULE_0, NULL);
@@ -1447,7 +1462,12 @@
}
uint32 SkyLogic::fnWeWait(uint32 id, uint32 b, uint32 c) {
- error("Stub: fnWeWait");
+ // We have hit another mega
+ // we are going to wait for it to move
+
+ _compact->extCompact->waitingFor = id;
+ stopAndWait();
+ return 1; // not sure about this
}
uint32 SkyLogic::fnSendSync(uint32 mega, uint32 sync, uint32 c) {
@@ -1489,8 +1509,72 @@
return 0; // drop from script
}
-uint32 SkyLogic::fnStartMenu(uint32 a, uint32 b, uint32 c) {
- error("Stub: fnStartMenu");
+uint32 SkyLogic::fnStartMenu(uint32 firstObject, uint32 b, uint32 c) {
+ // initialise the top menu bar
+ // firstObject is o0 for game menu, k0 for linc
+
+ // (1) FIRST, SET UP THE 2 ARROWS SO THEY APPEAR ON SCREEN
+
+ Compact *cpt = SkyState::fetchCompact(47);
+ cpt->status = ST_MOUSE + ST_FOREGROUND + ST_LOGIC + ST_RECREATE;
+ cpt->screen = (uint16)(_scriptVariables[SCREEN] & 0xffff);
+
+ cpt = SkyState::fetchCompact(48);
+ cpt->status = ST_MOUSE + ST_FOREGROUND + ST_LOGIC + ST_RECREATE;
+ cpt->screen = (uint16)(_scriptVariables[SCREEN] & 0xffff);
+
+ // (2) COPY OBJECTS FROM NON-ZERO INVENTORY VARIABLES INTO OBJECT DISPLAY LIST (& COUNT THEM)
+
+ // sort the objects and pad with blanks
+
+ uint32 menuLength = 0;
+ for (uint i = firstObject; i < firstObject + ARRAYSIZE(_objectList); i++) {
+ if ( _scriptVariables[i] )
+ _objectList[menuLength++] = _scriptVariables[i];
+ }
+ _scriptVariables[MENU_LENGTH] = menuLength;
+
+ // (3) OK, NOW TOP UP THE LIST WITH THE REQUIRED NO. OF BLANK OBJECTS (for min display length 11)
+
+ uint32 blankID = 51;
+ for (uint i = menuLength; i < 11; i++)
+ _objectList[i] = blankID++;
+
+ // (4) KILL ID's OF ALL 20 OBJECTS SO UNWANTED ICONS (SCROLLED OFF) DON'T REMAIN ON SCREEN
+ // (There should be a better way of doing this - only kill id of 12th item when menu has scrolled right)
+
+ for (int i = 0; i < ARRAYSIZE(_objectList); i++) {
+ if (_objectList[i])
+ (SkyState::fetchCompact(_objectList[i]))->status = ST_LOGIC;
+ }
+
+ // (5) NOW FIND OUT WHICH OBJECT TO START THE DISPLAY FROM (depending on scroll offset)
+
+ if (menuLength < 11) // check we can scroll
+ _scriptVariables[SCROLL_OFFSET] = 0;
+ else if (menuLength < _scriptVariables[SCROLL_OFFSET] + 11)
+ _scriptVariables[SCROLL_OFFSET] = menuLength - 11;
+
+ // (6) AND FINALLY, INITIALISE THE 11 OBJECTS SO THEY APPEAR ON SCREEEN
+
+ uint16 rollingX = 128 + 28;
+ for (int i = 0; i < 11; i++) {
+ cpt = SkyState::fetchCompact(
+ _objectList[_scriptVariables[SCROLL_OFFSET] + i]);
+
+ cpt->status = ST_MOUSE + ST_FOREGROUND + ST_LOGIC + ST_RECREATE;
+ cpt->screen = (uint16)(_scriptVariables[SCREEN] & 0xffff);
+
+ cpt->xcood = rollingX;
+ rollingX += 24;
+
+ if (_scriptVariables[MENU] == 2)
+ cpt->ycood = 136;
+ else
+ cpt->ycood = 112;
+ }
+
+ return 1;
}
uint32 SkyLogic::fnUnhighlight(uint32 item, uint32 b, uint32 c) {
@@ -1798,12 +1882,14 @@
error("Stub: fnSaveCoods");
}
-uint32 SkyLogic::fnPlotGrid(uint32 a, uint32 b, uint32 c) {
- error("Stub: fnPlotGrid");
+uint32 SkyLogic::fnPlotGrid(uint32 x, uint32 y, uint32 width) {
+ _skyGrid->plotGrid(x, y, width, _compact);
+ return 1;
}
-uint32 SkyLogic::fnRemoveGrid(uint32 a, uint32 b, uint32 c) {
- error("Stub: fnRemoveGrid");
+uint32 SkyLogic::fnRemoveGrid(uint32 x, uint32 y, uint32 width) {
+ _skyGrid->removeGrid(x, y, width, _compact);
+ return 1;
}
uint32 SkyLogic::fnEyeball(uint32 id, uint32 b, uint32 c) {
@@ -1840,7 +1926,7 @@
}
uint32 SkyLogic::fnEnterSection(uint32 sectionNo, uint32 b, uint32 c) {
-
+
if (SkyState::isDemo(_gameVersion))
if (sectionNo > 2)
error("End of demo");
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- logic.h 25 May 2003 15:41:48 -0000 1.14
+++ logic.h 26 May 2003 17:41:18 -0000 1.15
@@ -169,7 +169,7 @@
uint32 fnUnPauseFx(uint32 a, uint32 b, uint32 c);
uint32 fnPrintf(uint32 a, uint32 b, uint32 c);
- static uint16 _screen;
+ static uint32 _scriptVariables[838];
protected:
void push(uint32);
@@ -180,13 +180,15 @@
void initScriptVariables();
void mainAnim();
void runGetOff();
+ void stopAndWait();
uint16 *_moduleList[16];
uint32 _stack[20];
byte _stackPtr;
Compact *_compact;
- uint32 _scriptVariables[838];
+
+ uint32 _objectList[30];
uint32 _currentSection;
uint32 _saveCurrentSection;
Index: skydefs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/skydefs.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- skydefs.h 26 May 2003 14:45:10 -0000 1.15
+++ skydefs.h 26 May 2003 17:41:18 -0000 1.16
@@ -37,19 +37,23 @@
#define FIRST_TEXT_COMPACT 23
// scriptVariable offsets
-#define RESULT 0
-#define LOGIC_LIST_NO 2
-#define CUR_ID 12
-#define MOUSE_STATUS 13
-#define MOUSE_STOP 14
+#define RESULT 0
+#define SCREEN 1
+#define LOGIC_LIST_NO 2
+#define CUR_ID 12
+#define MOUSE_STATUS 13
+#define MOUSE_STOP 14
#define GET_OFF 18
-#define PLAYER_X 27
-#define PLAYER_Y 28
-#define PLAYER_MOOD 29
-#define PLAYER_SCREEN 30
-#define HIT_ID 37
-#define THE_CHOSEN_ONE 51
-#define TEXT1 53
+#define PLAYER_X 27
+#define PLAYER_Y 28
+#define PLAYER_MOOD 29
+#define PLAYER_SCREEN 30
+#define HIT_ID 37
+#define THE_CHOSEN_ONE 51
+#define TEXT1 53
+#define MENU_LENGTH 100
+#define SCROLL_OFFSET 101
+#define MENU 102
#define CUR_SECTION 143
//screen/grid defines
Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- text.cpp 17 May 2003 20:04:05 -0000 1.22
+++ text.cpp 26 May 2003 17:41:19 -0000 1.23
@@ -366,7 +366,7 @@
cpt->logic = logicNum;
cpt->status = ST_LOGIC | ST_FOREGROUND | ST_RECREATE;
- cpt->screen = SkyLogic::_screen;
+ cpt->screen = SkyLogic::_scriptVariables[SCREEN];
struct lowTextManager_t ret;
ret.textData = _dtData;
More information about the Scummvm-git-logs
mailing list