committing subversion revision 9519 by marcus
Animals are people, too. They should be allowed to cross borders as well!

modified:
s25client/trunk/src/
committing subversion revision 9520 by marcus
Crash fix - don't remove figure from list that isn't on it...

[...]
#4  erase (this=0x803fda0, __position=...) at /usr/include/c++/4.8/bits/list.tcc:112
#5  nobBaseWarehouse::CancelFigure (this=0x803fd20, figure=0x124ead10) at src/nobBaseWarehouse.cpp:875
#6  0x00000000008234d1 in nobMilitary::RegulateTroops (this=0x116c7c70) at src/nobMilitary.cpp:469
#7  0x0000000000713c42 in GameClientPlayer::NewSoldierAvailable (this=0x7e38508, soldier_count=@0x80400a0: 56) at src/GameClientPlayer.cpp:1357
#8  0x000000000081535f in nobBaseWarehouse::CheckJobsForNewFigure (this=0x803fd20, job=JOB_PRIVATE) at src/nobBaseWarehouse.cpp:783
#9  0x0000000000820f7a in nobMilitary::CancelOrders (this=this@entry=0x116c7c70) at src/nobMilitary.cpp:594
#10 0x0000000000821113 in nobMilitary::Destroy_nobMilitary (this=0x116c7c70) at src/nobMilitary.cpp:101
#11 0x0000000000823b75 in nobMilitary::HitOfCatapultStone (this=0x116c7c70) at src/nobMilitary.cpp:1190
#12 0x00000000006fdfab in EventManager::NextGF (this=0x7e4b2a0) at src/EventManager.cpp:131
#13 0x00000000007024ef in GameClient::NextGF (this=this@entry=0xc1cce0 <Singleton<GameClient>::me>) at src/GameClient.cpp:1522
#14 0x0000000000706268 in GameClient::ExecuteGameFrame (this=this@entry=0xc1cce0 <Singleton<GameClient>::me>, skipping=skipping@entry=false) at src/GameClient.cpp:1471
#15 0x000000000070656a in GameClient::Run (this=this@entry=0xc1cce0 <Singleton<GameClient>::me>) at src/GameClient.cpp:262
#16 0x0000000000722b4f in GameManager::Run (this=this@entry=0xc1bc20 <Singleton<GameManager>::me>) at src/GameManager.cpp:163
#17 0x00000000005308c1 in main (argc=<optimized out>, argv=<optimized out>) at src/main.cpp:348



modified:
s25client/trunk/src/