diff options
| author | megamage <none@none> | 2009-04-17 15:29:55 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-17 15:29:55 -0500 |
| commit | f0cbed1ad8376200bb450768d7b77198e6754113 (patch) | |
| tree | 55cc52add932df8ce9740824a09916deb2e95ba6 /src/game/Object.cpp | |
| parent | ca5894b34800782b98ee9c47d82081cf0a0c1555 (diff) | |
| parent | 6a53bada669c58393ec13c9bacd199c154fe023a (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
| -rw-r--r-- | src/game/Object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 3c776b6fdfa..015bb6d3479 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -637,15 +637,15 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask { if(target->isGameMaster()) { - if(cinfo->Modelid2) - *data << cinfo->Modelid1; + if(cinfo->Modelid_A2) + *data << cinfo->Modelid_A1; else *data << 17519; // world invisible trigger's model } else { - if(cinfo->Modelid2) - *data << cinfo->Modelid2; + if(cinfo->Modelid_A2) + *data << cinfo->Modelid_A2; else *data << 11686; // world invisible trigger's model } |