[Scummvm-cvs-logs] scummvm master -> 0dddc2053071aec1e276a7dcd8402d5b0e0ca270
dreammaster
dreammaster at scummvm.org
Mon Jun 2 02:37:59 CEST 2014
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2e587c5b4c MADS: Default new games to hard mode
0dddc20530 MADS: Use correct article for throwing items over fence
Commit: 2e587c5b4c659144142c09984018fdd19030c4ae
https://github.com/scummvm/scummvm/commit/2e587c5b4c659144142c09984018fdd19030c4ae
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-01T20:36:37-04:00
Commit Message:
MADS: Default new games to hard mode
Changed paths:
engines/mads/nebular/game_nebular.cpp
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index e5a59a0..8d1358f 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -39,7 +39,7 @@ GameNebular::GameNebular(MADSEngine *vm)
: Game(vm) {
_surface = new MSurface(MADS_SCREEN_WIDTH, MADS_SCENE_HEIGHT);
_storyMode = STORYMODE_NAUGHTY;
- _difficulty = DIFFICULTY_EASY;
+ _difficulty = DIFFICULTY_HARD;
}
ProtectionResult GameNebular::checkCopyProtection() {
Commit: 0dddc2053071aec1e276a7dcd8402d5b0e0ca270
https://github.com/scummvm/scummvm/commit/0dddc2053071aec1e276a7dcd8402d5b0e0ca270
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-01T20:37:21-04:00
Commit Message:
MADS: Use correct article for throwing items over fence
Changed paths:
engines/mads/action.cpp
engines/mads/scene.cpp
diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index ca682f0..42c528a 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -246,8 +246,8 @@ void MADSAction::set() {
_statusText += kArticleList[articleNum];
}
- } else if ((_articleNumber == VERB_LOOK) || (_vm->getGameID() != GType_RexNebular) ||
- (_action._indirectObjectId >= 0 && scene._vocabStrings[_action._indirectObjectId] != kFenceStr)) {
+ } else if ((_articleNumber != VERB_LOOK) || (_vm->getGameID() != GType_RexNebular) ||
+ (_action._indirectObjectId >= 0 && scene.getVocab(_action._indirectObjectId) != kFenceStr)) {
// Write out the article
_statusText += kArticleList[_articleNumber];
} else {
diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 0a45ee4..ca953a0 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -76,7 +76,7 @@ Scene::Scene(MADSEngine *vm)
_verbList.push_back(VerbInit(VERB_GIVE, VERB_THIS, PREP_TO));
_verbList.push_back(VerbInit(VERB_PULL, VERB_THAT, PREP_NONE));
_verbList.push_back(VerbInit(VERB_CLOSE, VERB_THAT, PREP_NONE));
- _verbList.push_back(VerbInit(VERB_THROW, VERB_THIS, PREP_TO));
+ _verbList.push_back(VerbInit(VERB_THROW, VERB_THIS, PREP_AT));
}
Scene::~Scene() {
More information about the Scummvm-git-logs
mailing list