Mercurial > mm7
comparison Actor.cpp @ 609:42d5777c2f47
Слияние
author | Ritor1 |
---|---|
date | Wed, 06 Mar 2013 18:22:25 +0600 |
parents | bee46636df95 |
children | 628694cd5744 |
comparison
equal
deleted
inserted
replaced
608:653724e9c234 | 609:42d5777c2f47 |
---|---|
3880 uAIState = Removed; | 3880 uAIState = Removed; |
3881 else | 3881 else |
3882 uCurrentActionAnimation = ANIM_Dead; | 3882 uCurrentActionAnimation = ANIM_Dead; |
3883 break; | 3883 break; |
3884 | 3884 |
3885 case Removed: | |
3886 return; | |
3887 | |
3885 default: | 3888 default: |
3886 assert(false); | 3889 assert(false); |
3887 } | 3890 } |
3888 } | 3891 } |
3889 | 3892 |