libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 04:35:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AVALANCHE: Change _pingo into pointer, update everything accordingly.

Browse Source
This commit is contained in:
uruk 2013-07-24 18:50:13 +02:00
parent 4d25117135
commit c0823f3e79
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/avalanche/acci2.cpp
View File

@ -1294,7 +1294,7 @@ void Acci::do_that() {
"do things I tell you not to?\r\rDon't do it again!");
break;
default:
_vm->_pingo.zonk();
_vm->_pingo->zonk();
_vm->_scrolls.display(Common::String("A crack of lightning shoots from the sky, ") +
"and fries you.\r\r(`Such is the anger of the gods, Avvy!\")");
_vm->_lucerna.gameover();

6
engines/avalanche/avalanche.cpp
View File

@ -61,8 +61,10 @@ AvalancheEngine::~AvalancheEngine() {
delete _avalot;
delete _gyro;
delete _enhanced;
delete _timeout;
delete _logger;
delete _pingo;
delete _timeout;
}
Common::ErrorCode AvalancheEngine::initialize() {
@ -72,7 +74,7 @@ Common::ErrorCode AvalancheEngine::initialize() {
_gyro = new Gyro(this);
_enhanced = new Enhanced(this);
_logger = new Logger(this);
_pingo.setParent(this);
_pingo = new Pingo(this);
_scrolls.setParent(this);
_visa.setParent(this);
_lucerna.setParent(this);

2
engines/avalanche/avalanche.h
View File

@ -71,7 +71,7 @@ public:
Gyro *_gyro;
Enhanced *_enhanced;
Logger *_logger;
Pingo _pingo;
Pingo *_pingo;
Scrolls _scrolls;
Visa _visa;
Lucerna _lucerna;

2
engines/avalanche/avalot.cpp
View File

@ -98,7 +98,7 @@ void Avalot::setup() {
_vm->_gyro->enid_filename = ""; /* undefined. */
_vm->_lucerna.toolbar();
_vm->_scrolls.state(2);
_vm->_graphics->refreshScreen(); //_vm->_pingo.copy03(); Replace it with refreshScreen() since they 'almost' have the same functionality.
_vm->_graphics->refreshScreen(); //_vm->_pingo->copy03(); Replace it with refreshScreen() since they 'almost' have the same functionality.
for (byte i = 0; i < 3; i++)
_vm->_gyro->lastscore[i] = -1; /* impossible digits */

2
engines/avalanche/lucerna2.cpp
View File

@ -274,7 +274,7 @@ void Lucerna::load(byte n) { /* Load2, actually */
load_also(xx);
_vm->_celer.load_chunks(xx);
_vm->_graphics->refreshScreen(); // _vm->_pingo.copy03(); - See Avalot::setup()
_vm->_graphics->refreshScreen(); // _vm->_pingo->copy03(); - See Avalot::setup()
bit = *_vm->_graphics->getPixel(0,0);

2
engines/avalanche/pingo2.cpp
View File

@ -40,7 +40,7 @@
namespace Avalanche {
void Pingo::setParent(AvalancheEngine *vm) {
Pingo::Pingo(AvalancheEngine *vm) {
_vm = vm;
}

2
engines/avalanche/pingo2.h
View File

@ -38,7 +38,7 @@ class AvalancheEngine;
class Pingo {
public:
void setParent(AvalancheEngine *vm);
Pingo(AvalancheEngine *vm);
void bosskey();

4
engines/avalanche/timeout2.cpp
View File

@ -490,7 +490,7 @@ void Timeout::buydrinks() {
_vm->_gyro->dna.malagauche = 0;
_vm->_visa.dixi('D', _vm->_gyro->dna.drinking); /* _vm->_scrolls.display message about it. */
_vm->_pingo.wobble(); /* Do the special effects. */
_vm->_pingo->wobble(); /* Do the special effects. */
_vm->_visa.dixi('D', 1); /* That'll be thruppence. */
if (_vm->_gyro->pennycheck(3)) /* Pay 3d. */
_vm->_visa.dixi('D', 3); /* Tell 'em you paid up. */
@ -614,7 +614,7 @@ void Timeout::arkata_shouts() {
void Timeout::winning() {
_vm->_visa.dixi('q', 79);
_vm->_pingo.winning_pic();
_vm->_pingo->winning_pic();
do {
_vm->_lucerna.checkclick();