Instructions Jenkins Doxygen

[added] player may sample resources while riding creatures 31/1431/1
authorKlivian <klivian@hotmail.com>
Thu, 27 Feb 2014 02:17:33 +0000 (02:17 +0000)
committerKlivian <klivian@hotmail.com>
Thu, 27 Feb 2014 02:17:33 +0000 (02:17 +0000)
Change-Id: I3fd303783f5d03152d9efc518ef8953a5e882b27

MMOCoreORB/src/server/zone/objects/player/sessions/survey/SurveySessionImplementation.cpp

index 9646848..4597c6a 100644 (file)
@@ -181,8 +181,8 @@ void SurveySessionImplementation::startSample(const String& resname) {
                return;
        }
 
-       if (surveyer->isRidingMount()) {
-               surveyer->sendSystemMessage("@error_message:survey_on_mount");
+       if (surveyer->getParent() != NULL && surveyer->getParent().get()->isVehicleObject() ) {
+               surveyer->sendSystemMessage("You cannot perform that action while driving a vehicle.");
                return;
        }
 
@@ -210,8 +210,8 @@ void SurveySessionImplementation::startSample(const String& resname) {
                }
        }
 
-       // Player must be kneeling to sample
-       if (!surveyer->isKneeling()) {
+       // Player must be kneeling to sample (if unmounted)
+       if (!surveyer->isKneeling() && !surveyer->isRidingMount() ) {
                surveyer->setPosture(CreaturePosture::CROUCHED, true);
        }
 
@@ -310,7 +310,7 @@ void SurveySessionImplementation::surveyCnodeMinigame(int value) {
        surveyer->sendSystemMessage("@survey:node_waypoint");
 
        // Player must be kneeling to sample
-       if (!surveyer->isStanding())
+       if (!surveyer->isStanding() && !surveyer->isRidingMount() )
                surveyer->setPosture(CreaturePosture::UPRIGHT, true);
 }