Mercurial > mm7
comparison Game.cpp @ 13:c941f63cdbfc
Слияние
author | Ritor1 |
---|---|
date | Wed, 16 Jan 2013 18:38:45 +0600 |
parents | 66319a734368 |
children | 653fdf29c654 |
comparison
equal
deleted
inserted
replaced
12:144f4815e63a | 13:c941f63cdbfc |
---|---|
319 if ( v16 ) | 319 if ( v16 ) |
320 { | 320 { |
321 v16 = 0; | 321 v16 = 0; |
322 viewparams->bRedrawGameUI = true; | 322 viewparams->bRedrawGameUI = true; |
323 } | 323 } |
324 //pAudioPlayer->_4AAFCF();Ritor1: it's temporarily | 324 //pAudioPlayer->_4AAFCF();//Ritor1: it's temporarily, game crash |
325 if (uGameState == 1) | 325 if (uGameState == 1) |
326 //goto LABEL_96; | 326 //goto LABEL_96; |
327 { | 327 { |
328 bLoadinga = 1; | 328 bLoadinga = 1; |
329 continue; | 329 continue; |