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

ZVISION: Add custom equality operators for game location

Browse Source 
This makes the location checks more readable
This commit is contained in:
Filippos Karapetis 2015-02-14 14:45:08 +02:00
parent 2d2cfbe005
commit 14914b2a31
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/zvision/core/events.cpp
View File

@ -152,7 +152,7 @@ void ZVision::cheatCodes(uint8 key) {
if (checkCode("HELLOSAILOR")) {
Audio::AudioStream *soundStream;
if (loc.world == 'v' && loc.room == 'b' && loc.node == '1' && loc.view == '0') {
if (loc == "vb10") {
soundStream = makeRawZorkStream("v000hpta.raw", this);
} else {
soundStream = makeRawZorkStream("v000hnta.raw", this);

3
engines/zvision/scripting/effects/music_effect.cpp
View File

@ -227,8 +227,7 @@ bool PanTrackNode::process(uint32 deltaTimeInMillis) {
int volumeCorrection = 2;
if (_engine->getGameId() == GID_GRANDINQUISITOR) {
Location loc = scriptManager->getCurrentLocation();
if (loc.world == 'd' && loc.room == 'c' && loc.node == '1' && loc.view == '0')
if (scriptManager->getCurrentLocation() == "dc10")
volumeCorrection = 5;
}

7
engines/zvision/scripting/script_manager.cpp
View File

@ -72,8 +72,7 @@ void ScriptManager::initialize() {
}
void ScriptManager::update(uint deltaTimeMillis) {
if (_currentLocation.node != _nextLocation.node || _currentLocation.room != _nextLocation.room ||
_currentLocation.view != _nextLocation.view || _currentLocation.world != _nextLocation.world) {
if (_currentLocation != _nextLocation) {
ChangeLocationReal(false);
}
@ -543,7 +542,7 @@ void ScriptManager::changeLocation(char _world, char _room, char _node, char _vi
_nextLocation.view = _view;
_nextLocation.offset = offset;
// If next location is 0000, return to the previous location.
if (_nextLocation.world == '0' && _nextLocation.room == '0' && _nextLocation.node == '0' && _nextLocation.view == '0') {
if (_nextLocation == "0000") {
if (getStateValue(StateKey_World) != 'g' || getStateValue(StateKey_Room) != 'j') {
_nextLocation.world = getStateValue(StateKey_LastWorld);
_nextLocation.room = getStateValue(StateKey_LastRoom);
@ -680,7 +679,7 @@ void ScriptManager::ChangeLocationReal(bool isLoading) {
// Change the background position
_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
if (_currentLocation.world == 0 && _currentLocation.room == 0 && _currentLocation.node == 0 && _currentLocation.view == 0) {
if (_currentLocation == "0000") {
_currentLocation = _nextLocation;
execScope(world);
execScope(room);

22
engines/zvision/scripting/script_manager.h
View File

@ -113,6 +113,28 @@ struct Location {
uint32 offset;
};
inline bool operator==(const Location& lhs, const Location& rhs) {
return (
lhs.world == rhs.world &&
lhs.room == rhs.room &&
lhs.node == rhs.node &&
lhs.view == rhs.view
);
}
inline bool operator==(const Location& lhs, const char* rhs) {
Common::String lhsStr = Common::String::format("%c%c%c%c", lhs.world, lhs.room, lhs.node, lhs.view);
return lhsStr == rhs;
}
inline bool operator!=(const Location& lhs, const Location& rhs) {
return !(lhs == rhs);
}
inline bool operator!=(const Location& lhs, const char* rhs) {
return !(lhs == rhs);
}
typedef Common::List<Puzzle *> PuzzleList;
typedef Common::Queue<Puzzle *> PuzzleQueue;
typedef Common::List<Control *> ControlList;