Mercurial > might-and-magic-trilogy
comparison mm7_2.cpp @ 199:10ae648c8d20
Слияние
| author | Ritor1 |
|---|---|
| date | Sat, 29 Dec 2012 14:18:20 +0600 |
| parents | 6109a4e23903 |
| children | c04d432611e1 |
comparison
equal
deleted
inserted
replaced
| 198:03d52010d433 | 199:10ae648c8d20 |
|---|---|
| 16389 { | 16389 { |
| 16390 pAudioPlayer->StopChannels(-1, -1); | 16390 pAudioPlayer->StopChannels(-1, -1); |
| 16391 UI_CreateTravelDialogue(); | 16391 UI_CreateTravelDialogue(); |
| 16392 } | 16392 } |
| 16393 } | 16393 } |
| 16394 UpdateActors_ODM(); | 16394 //UpdateActors_ODM();Ritor1: it's temporarily |
| 16395 _46CC4B_check_event_triggers(); | 16395 _46CC4B_check_event_triggers(); |
| 16396 } | 16396 } |
| 16397 | 16397 |
| 16398 | 16398 |
| 16399 | 16399 |