libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fix compilation issues

Browse Source
This commit is contained in:
Paul Gilbert 2016-06-23 19:08:45 -04:00
parent 3fb8c888a7
commit 54eac84dc5
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/titanic/core/game_object.cpp
View File

@ -790,12 +790,6 @@ void CGameObject::dec54() {
getGameManager()->dec54();
}
void CGameObject::petAddRandomRoom(int passClassNum) {
CPetControl *petControl = getPetControl();
if (petControl)
petControl->addRandomRoom(passClassNum);
}
void CGameObject::lockMouse() {
CGameManager *gameMan = getGameManager();
gameMan->lockInputHandler();
@ -897,7 +891,7 @@ void CGameObject::checkPlayMovie(const CString &name, int flags) {
void CGameObject::clearPet() const {
CPetControl *petControl = getPetControl();
if (petControl)
petControl->clear();
petControl->resetActiveNPC();
}
CPetControl *CGameObject::getPetControl() const {

2
engines/titanic/game/television.cpp
View File

@ -141,7 +141,7 @@ bool CTelevision::ChangeSeasonMsg(CChangeSeasonMsg *msg) {
bool CTelevision::EnterViewMsg(CEnterViewMsg *msg) {
setPetArea(PET_REMOTE);
petHighlightGlyph(GLYPH_TELEVISION_CONTROL);
petFn3(0);
petSetRemoteTarget();
setVisible(0);
_fieldE0 = 1;

8
engines/titanic/pet_control/pet_control.cpp
View File

@ -59,7 +59,7 @@ void CPetControl::save(SimpleFile *file, int indent) const {
file->writeNumberLine(0, indent);
file->writeNumberLine(_currentArea, indent);
file->writeQuotedLine(_activeNPCName, indent);
file->writeQuotedLine(_string2, indent);
file->writeQuotedLine(_remoteTargetName, indent);
saveAreas(file, indent);
CGameObject::save(file, indent);
@ -72,7 +72,7 @@ void CPetControl::load(SimpleFile *file) {
if (!val) {
_currentArea = (PetArea)file->readNumber();
_activeNPCName = file->readString();
_string2 = file->readString();
_remoteTargetName = file->readString();
loadAreas(file, 0);
}
@ -151,8 +151,8 @@ void CPetControl::postLoad() {
if (!_activeNPCName.empty() && root)
_activeNPC = root->findByName(_activeNPCName);
if (!_string2.empty() && root)
_remoteTarget = root->findByName(_string2);
if (!_remoteTargetName.empty() && root)
_remoteTarget = static_cast<CGameObject *>(root->findByName(_remoteTargetName));
setArea(_currentArea);
loaded();

6
engines/titanic/pet_control/pet_rooms_glyphs.cpp
View File

@ -80,8 +80,10 @@ int CPetRoomsGlyph::proc33() {
return 1;
}
void CPetRoomsGlyph::proc39() {
void CPetRoomsGlyph::loadFlags(SimpleFile *file, int val) {
if (!val) {
_roomFlags = file->readNumber();
}
}
void CPetRoomsGlyph::changeLocation(int newClassNum) {

7
engines/titanic/pet_control/pet_rooms_glyphs.h
View File

@ -24,6 +24,7 @@
#define TITANIC_PET_ROOMS_GLYPHS_H
#include "titanic/pet_control/pet_glyphs.h"
#include "titanic/support/simple_file.h"
namespace Titanic {
@ -71,9 +72,11 @@ public:
virtual void save2(SimpleFile *file, int indent) const;
virtual int proc33();
virtual void proc39();
/**
* Loads flags for the glyph
*/
virtual void loadFlags(SimpleFile *file, int val);
/**
* Set the room flags for the glyph