thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added some buggy, incomplete mouse code

Browse source 
svn-id: r8233
This commit is contained in:
Joost Peters 2003-06-01 12:49:39 +00:00
parent 5c91b160f6
commit 063c310917
4 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sky/logic.cpp
View file

@ -1187,8 +1187,7 @@ bool SkyLogic::fnAssignBase(uint32 id, uint32 scr, uint32 c) {
}
bool SkyLogic::fnDiskMouse(uint32 a, uint32 b, uint32 c) {
warning("Stub: fnDiskMouse");
return true;
return _skyMouse->fnDiskMouse();
}
bool SkyLogic::fnNormalMouse(uint32 a, uint32 b, uint32 c) {
@ -1196,7 +1195,7 @@ bool SkyLogic::fnNormalMouse(uint32 a, uint32 b, uint32 c) {
}
bool SkyLogic::fnBlankMouse(uint32 a, uint32 b, uint32 c) {
return (_skyMouse->fnBlankMouse() != 0);
return _skyMouse->fnBlankMouse();
}
bool SkyLogic::fnCrossMouse(uint32 a, uint32 b, uint32 c) {
@ -2060,12 +2059,11 @@ void SkyLogic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32
if (SkyTalkAnims::animTalkTableIsPointer[offset]) //is it a pointer?
animPtr = (uint16 *)SkyTalkAnims::animTalkTablePtr[offset];
else { //then it must be a value
else //then it must be a value
animPtr = (uint16 *)SkyState::fetchCompact(SkyTalkAnims::animTalkTableVal[offset]);
target->offset = *animPtr++;
target->getToFlag = *animPtr++;
}
target->offset = *animPtr++;
target->getToFlag = *animPtr++;
target->grafixProg = animPtr;
if (SkyState::isCDVersion(_gameVersion))