Mercurial > mm7
comparison Actor.cpp @ 661:2535151505da
Слияние
author | Ritor1 |
---|---|
date | Tue, 12 Mar 2013 09:43:50 +0600 |
parents | 1ff57450f090 |
children | 52329962fcdb |
comparison
equal
deleted
inserted
replaced
660:94fab082f146 | 661:2535151505da |
---|---|
3881 else | 3881 else |
3882 uCurrentActionAnimation = ANIM_Dead; | 3882 uCurrentActionAnimation = ANIM_Dead; |
3883 break; | 3883 break; |
3884 | 3884 |
3885 case Removed: | 3885 case Removed: |
3886 case Disabled: | |
3886 return; | 3887 return; |
3887 | 3888 |
3888 default: | 3889 default: |
3889 assert(false); | 3890 assert(false); |
3890 } | 3891 } |