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

objects now work in Winnie Amiga

Browse source 
svn-id: r29051
This commit is contained in:
Matthew Hoops 2007-09-23 13:47:50 +00:00
parent 9d26f30929
commit 35a3f9c9ac
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/agi/preagi_winnie.cpp
View file

@ -156,6 +156,10 @@ uint32 Winnie::readObj(int iObj, uint8 *buffer) {
return 0; return 0;
} }
uint32 filelen = file.size(); uint32 filelen = file.size();
if (_vm->getPlatform() == Common::kPlatformC64) { //Skip the loading address
filelen -= 2;
file.seek(2, SEEK_CUR);
}
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
file.read(buffer, filelen); file.read(buffer, filelen);
file.close(); file.close();
@ -307,7 +311,10 @@ int Winnie::parser(int pc, int index, uint8 *buffer) {
break; break;
default: default:
// print description // print description
_vm->printStrXOR((char *)(buffer + pc)); if (_vm->getPlatform() != Common::kPlatformAmiga)
_vm->printStrXOR((char *)(buffer + pc));
else
_vm->printStr((char *)(buffer + pc));
if (_vm->getSelection(kSelBackspace) == 1) if (_vm->getSelection(kSelBackspace) == 1)
return IDI_WTP_PAR_OK; return IDI_WTP_PAR_OK;
else else
@ -502,7 +509,10 @@ void Winnie::printObjStr(int iObj, int iStr) {
readObj(iObj, buffer); readObj(iObj, buffer);
parseObjHeader(&hdr, buffer, sizeof(hdr)); parseObjHeader(&hdr, buffer, sizeof(hdr));
_vm->printStrXOR((char *)(buffer + hdr.ofsStr[iStr] - IDI_WTP_OFS_OBJ)); if (_vm->getPlatform() != Common::kPlatformAmiga)
_vm->printStrXOR((char *)(buffer + hdr.ofsStr[iStr] - IDI_WTP_OFS_OBJ));
else
_vm->printStr((char *)(buffer + hdr.ofsStr[iStr]));
free(buffer); free(buffer);
} }
@ -1108,9 +1118,12 @@ void Winnie::drawObjPic(int iObj, int x0, int y0) {
uint32 objSize = readObj(iObj, buffer); uint32 objSize = readObj(iObj, buffer);
parseObjHeader(&objhdr, buffer, sizeof(WTP_OBJ_HDR)); parseObjHeader(&objhdr, buffer, sizeof(WTP_OBJ_HDR));
if (_vm->getPlatform() == Common::kPlatformPC)
objhdr.ofsPic -= IDI_WTP_OFS_OBJ;
_vm->_picture->setOffset(x0, y0); _vm->_picture->setOffset(x0, y0);
_vm->_picture->decodePicture(buffer + objhdr.ofsPic - IDI_WTP_OFS_OBJ, objSize, 0, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT); _vm->_picture->decodePicture(buffer + objhdr.ofsPic, objSize, 0, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT);
_vm->_picture->setOffset(0, 0); _vm->_picture->setOffset(0, 0);
_vm->_picture->showPic(10, 0, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT); _vm->_picture->showPic(10, 0, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT);
@ -1138,7 +1151,7 @@ void Winnie::drawRoomPic() {
_vm->_picture->showPic(IDI_WTP_PIC_X0, IDI_WTP_PIC_Y0, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT); _vm->_picture->showPic(IDI_WTP_PIC_X0, IDI_WTP_PIC_Y0, IDI_WTP_PIC_WIDTH, IDI_WTP_PIC_HEIGHT);
// draw object picture // draw object picture
if (_vm->getPlatform() != Common::kPlatformAmiga && _vm->getPlatform() != Common::kPlatformC64) if (_vm->getPlatform() != Common::kPlatformC64)
drawObjPic(iObj, IDI_WTP_PIC_X0 + roomhdr.objX, IDI_WTP_PIC_Y0 + roomhdr.objY); drawObjPic(iObj, IDI_WTP_PIC_X0 + roomhdr.objX, IDI_WTP_PIC_Y0 + roomhdr.objY);
free(buffer); free(buffer);
@ -1167,7 +1180,7 @@ void Winnie::printRoomStr(int iRoom, int iStr) {
else if (_vm->getPlatform() == Common::kPlatformC64) else if (_vm->getPlatform() == Common::kPlatformC64)
_vm->printStrXOR((char *)(buffer + hdr.ofsStr[iStr - 1] - IDI_WTP_OFS_ROOM_C64)); _vm->printStrXOR((char *)(buffer + hdr.ofsStr[iStr - 1] - IDI_WTP_OFS_ROOM_C64));
else if (_vm->getPlatform() == Common::kPlatformAmiga) else if (_vm->getPlatform() == Common::kPlatformAmiga)
_vm->printStrXOR((char *)(buffer + hdr.ofsStr[iStr - 1])); _vm->printStr((char *)(buffer + hdr.ofsStr[iStr - 1]));
free(buffer); free(buffer);
} }