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

PreAGI works with the new GMM implementation

Browse source 
svn-id: r32956
This commit is contained in:
Christopher Page 2008-07-08 01:33:57 +00:00
parent a43f016b94
commit 3beccaf115
6 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/agi/loader_v3.cpp
View file

@ -27,6 +27,7 @@
#include "agi/lzw.h" #include "agi/lzw.h"
#include "common/config-manager.h" #include "common/config-manager.h"
#include "common/events.h"
#include "common/fs.h" #include "common/fs.h"
namespace Agi { namespace Agi {
@ -231,7 +232,7 @@ uint8 *AgiLoader_v3::loadVolRes(AgiDir *agid) {
debugC(3, kDebugLevelResources, "x = %x %x", x[0], x[1]); debugC(3, kDebugLevelResources, "x = %x %x", x[0], x[1]);
error("ACK! BAD RESOURCE"); error("ACK! BAD RESOURCE");
g_system->quit(); g_system->getEventManager()->pushEvent(Common::EVENT_QUIT);
} }
agid->len = READ_LE_UINT16((uint8 *) x + 3); /* uncompressed size */ agid->len = READ_LE_UINT16((uint8 *) x + 3); /* uncompressed size */

2
engines/agi/preagi.cpp
View file

@ -228,7 +228,7 @@ FIXME (Fingolfin asks): Why are Mickey, Winnie and Troll standalone classes
error("Unknown preagi engine"); error("Unknown preagi engine");
break; break;
} }
return 0; return _eventMan->shouldRTL();
} }
} // End of namespace Agi } // End of namespace Agi

4
engines/agi/preagi_common.cpp
View file

@ -122,11 +122,11 @@ void PreAgiEngine::printStrXOR(char *szMsg) {
int PreAgiEngine::getSelection(SelectionTypes type) { int PreAgiEngine::getSelection(SelectionTypes type) {
Common::Event event; Common::Event event;
for (;;) { while (!_eventMan->shouldQuit()) {
while (_eventMan->pollEvent(event)) { while (_eventMan->pollEvent(event)) {
switch(event.type) { switch(event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
_system->quit(); return 0;
case Common::EVENT_RBUTTONUP: case Common::EVENT_RBUTTONUP:
return 0; return 0;
case Common::EVENT_LBUTTONUP: case Common::EVENT_LBUTTONUP:

8
engines/agi/preagi_mickey.cpp
View file

@ -343,11 +343,11 @@ bool Mickey::getMenuSelRow(MSA_MENU menu, int *sel0, int *sel1, int iRow) {
drawMenu(menu, *sel0, *sel1); drawMenu(menu, *sel0, *sel1);
for (;;) { while (!_vm->_system->getEventManager()->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) { while (_vm->_system->getEventManager()->pollEvent(event)) {
switch(event.type) { switch(event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
exit(0); return 0;
case Common::EVENT_MOUSEMOVE: case Common::EVENT_MOUSEMOVE:
if (iRow < 2) { if (iRow < 2) {
x = event.mouse.x / 8; x = event.mouse.x / 8;
@ -641,7 +641,6 @@ void Mickey::playSound(ENUM_MSA_SOUND iSound) {
while (_vm->_system->getEventManager()->pollEvent(event)) { while (_vm->_system->getEventManager()->pollEvent(event)) {
switch(event.type) { switch(event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
_vm->_system->quit();
case Common::EVENT_LBUTTONUP: case Common::EVENT_LBUTTONUP:
case Common::EVENT_RBUTTONUP: case Common::EVENT_RBUTTONUP:
case Common::EVENT_KEYDOWN: case Common::EVENT_KEYDOWN:
@ -2054,7 +2053,6 @@ void Mickey::waitAnyKey(bool anim) {
while (_vm->_system->getEventManager()->pollEvent(event)) { while (_vm->_system->getEventManager()->pollEvent(event)) {
switch(event.type) { switch(event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
_vm->_system->quit();
case Common::EVENT_KEYDOWN: case Common::EVENT_KEYDOWN:
case Common::EVENT_LBUTTONUP: case Common::EVENT_LBUTTONUP:
case Common::EVENT_RBUTTONUP: case Common::EVENT_RBUTTONUP:
@ -2153,7 +2151,7 @@ void Mickey::run() {
intro(); intro();
// Game loop // Game loop
for (;;) { while (!_vm->_system->getEventManager()->shouldQuit()) {
drawRoom(); drawRoom();
if (_game.fIntro) { if (_game.fIntro) {

7
engines/agi/preagi_troll.cpp
View file

@ -58,11 +58,11 @@ bool Troll::getMenuSel(const char *szMenu, int *iSel, int nSel) {
drawMenu(szMenu, *iSel); drawMenu(szMenu, *iSel);
for (;;) { while (!_vm->_system->getEventManager()->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) { while (_vm->_system->getEventManager()->pollEvent(event)) {
switch(event.type) { switch(event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
_vm->_system->quit(); return 0;
case Common::EVENT_MOUSEMOVE: case Common::EVENT_MOUSEMOVE:
y = event.mouse.y / 8; y = event.mouse.y / 8;
@ -206,7 +206,6 @@ void Troll::waitAnyKeyIntro() {
while (_vm->_system->getEventManager()->pollEvent(event)) { while (_vm->_system->getEventManager()->pollEvent(event)) {
switch(event.type) { switch(event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
_vm->_system->quit();
case Common::EVENT_LBUTTONUP: case Common::EVENT_LBUTTONUP:
case Common::EVENT_KEYDOWN: case Common::EVENT_KEYDOWN:
return; return;
@ -269,7 +268,7 @@ void Troll::tutorial() {
int iSel = 0; int iSel = 0;
//char szTreasure[16] = {0}; //char szTreasure[16] = {0};
for (;;) { while (!_vm->_system->getEventManager()->shouldQuit()) {
_vm->clearScreen(0xFF); _vm->clearScreen(0xFF);
_vm->printStr(IDS_TRO_TUTORIAL_0); _vm->printStr(IDS_TRO_TUTORIAL_0);

9
engines/agi/preagi_winnie.cpp
View file

@ -241,7 +241,7 @@ int Winnie::parser(int pc, int index, uint8 *buffer) {
// extract header from buffer // extract header from buffer
parseRoomHeader(&hdr, buffer, sizeof(WTP_ROOM_HDR)); parseRoomHeader(&hdr, buffer, sizeof(WTP_ROOM_HDR));
for (;;) { while (!_vm->_system->getEventManager()->shouldQuit()) {
pc = startpc; pc = startpc;
// check if block is to be run // check if block is to be run
@ -797,12 +797,11 @@ void Winnie::getMenuSel(char *szMenu, int *iSel, int fCanSel[]) {
// Show the mouse cursor for the menu // Show the mouse cursor for the menu
CursorMan.showMouse(true); CursorMan.showMouse(true);
for (;;) { while (!_vm->_system->getEventManager()->shouldQuit()) {
while (_vm->_system->getEventManager()->pollEvent(event)) { while (_vm->_system->getEventManager()->pollEvent(event)) {
switch(event.type) { switch(event.type) {
case Common::EVENT_QUIT: case Common::EVENT_QUIT:
_vm->_system->quit(); return;
break;
case Common::EVENT_MOUSEMOVE: case Common::EVENT_MOUSEMOVE:
x = event.mouse.x / 8; x = event.mouse.x / 8;
y = event.mouse.y / 8; y = event.mouse.y / 8;
@ -1014,7 +1013,7 @@ phase2:
if (parser(hdr.ofsDesc[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_BACK) if (parser(hdr.ofsDesc[iBlock] - _roomOffset, iBlock, roomdata) == IDI_WTP_PAR_BACK)
goto phase1; goto phase1;
} }
for (;;) { while (!_vm->_system->getEventManager()->shouldQuit()) {
for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) { for (iBlock = 0; iBlock < IDI_WTP_MAX_BLOCK; iBlock++) {
switch(parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata)) { switch(parser(hdr.ofsBlock[iBlock] - _roomOffset, iBlock, roomdata)) {
case IDI_WTP_PAR_GOTO: case IDI_WTP_PAR_GOTO: