Mercurial > mm7
comparison NPC.cpp @ 609:42d5777c2f47
Слияние
author | Ritor1 |
---|---|
date | Wed, 06 Mar 2013 18:22:25 +0600 |
parents | f54481c85df8 |
children | 59713bb36033 |
comparison
equal
deleted
inserted
replaced
608:653724e9c234 | 609:42d5777c2f47 |
---|---|
482 pProfessions[i].pDismissText = RemoveQuotes(test_string); | 482 pProfessions[i].pDismissText = RemoveQuotes(test_string); |
483 } | 483 } |
484 } | 484 } |
485 else | 485 else |
486 { | 486 { |
487 if (!decode_step) | 487 if (decode_step) |
488 break_loop = true; | 488 break_loop = true; |
489 } | 489 } |
490 ++decode_step; | 490 ++decode_step; |
491 test_string=tmp_pos+1; | 491 test_string=tmp_pos+1; |
492 } while ((decode_step<7)&&!break_loop); | 492 } while ((decode_step<7)&&!break_loop); |