diff options
| author | click <none@none> | 2010-05-10 13:27:18 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-05-10 13:27:18 +0200 |
| commit | d79f6295aa461833db9996d375cf0cebead654d9 (patch) | |
| tree | b5c32c7bc0ff2bf254942836fe3b0c1f311cb2c7 | |
| parent | 5b20d478ffa556941735cfe7ef2d377600c75732 (diff) | |
Add support for NPC-based start of playing moviesequence + clean up indenting on earlier commit
--HG--
branch : trunk
| -rw-r--r-- | src/game/Map.cpp | 10 | ||||
| -rw-r--r-- | src/game/Spell.cpp | 4 | ||||
| -rw-r--r-- | src/game/World.h | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 80601f5b97e..8608bad582b 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -3726,6 +3726,16 @@ void Map::ScriptsProcess() break; } + case SCRIPT_COMMAND_PLAYMOVIE: + { + if (!source) + { + sLog.outError("SCRIPT_COMMAND_PLAYMOVIE call for NULL creature."); + break; + } + player->SendMovieStart(step.script->datalong); + break; + } default: sLog.outError("Unknown script command %u called.",step.script->command); break; diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 8fb32339522..e551827459d 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -5199,8 +5199,8 @@ SpellCastResult Spell::CheckCast(bool strict) if (m_spellInfo->Id == 781) if (!m_caster->isInCombat()) return SPELL_FAILED_CANT_DO_THAT_RIGHT_NOW; - if (m_caster->hasUnitState(UNIT_STAT_ROOT)) - return SPELL_FAILED_ROOTED; + if (m_caster->hasUnitState(UNIT_STAT_ROOT)) + return SPELL_FAILED_ROOTED; break; } default:break; diff --git a/src/game/World.h b/src/game/World.h index ff641118ace..d56481f0161 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -440,11 +440,11 @@ enum WorldStates #define SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT 21 // datalong scriptid, lowguid datalong2, dataint table #define SCRIPT_COMMAND_KILL 22 // datalong removecorpse - //trinity only #define SCRIPT_COMMAND_ORIENTATION 30 // o = orientation #define SCRIPT_COMMAND_EQUIP 31 // datalong = equipment id #define SCRIPT_COMMAND_MODEL 32 // datalong = model id +#define SCRIPT_COMMAND_PLAYMOVIE 34 // datalong = movie id /// Storage class for commands issued for delayed execution struct CliCommandHolder |