RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clarify assertions

This commit is contained in:
David Rose 2007-07-18 06:47:53 +00:00
parent cbaa8832d3
commit a2e7037b16
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/char/characterJointEffect.cxx
View File

@ -63,6 +63,7 @@ make(Character *character) {
// itself on whether its pointer is valid or not.
if (!new_effect->_character.is_valid_pointer()) {
nassertr(new_effect->_character.get_orig() == character, new_effect_raw);
((CharacterJointEffect *)new_effect)->_character = character;
}
@ -205,8 +206,8 @@ compare_to_impl(const RenderEffect *other) const {
const CharacterJointEffect *ta;
DCAST_INTO_R(ta, other, 0);
if (_character != ta->_character) {
return _character < ta->_character ? -1 : 1;
if (_character.get_orig() != ta->_character.get_orig()) {
return _character.get_orig() < ta->_character.get_orig() ? -1 : 1;
}
// As tempting as it is to include the sense of whether the