Mercurial > mm7
diff UI/UIHouses.cpp @ 2376:bcd7fadbf7d2
Слияние
author | Ritor1 |
---|---|
date | Mon, 12 May 2014 12:28:06 +0600 |
parents | bddcaf5d5db2 |
children | 802460e60eee |
line wrap: on
line diff
--- a/UI/UIHouses.cpp Mon May 12 12:27:50 2014 +0600 +++ b/UI/UIHouses.cpp Mon May 12 12:28:06 2014 +0600 @@ -3087,9 +3087,7 @@ char* tmp_pos; int decode_step; - if ( p2DEventsTXT_Raw ) - free(p2DEventsTXT_Raw); - p2DEventsTXT_Raw = NULL; + free(p2DEventsTXT_Raw); p2DEventsTXT_Raw = (char *)pEvents_LOD->LoadRaw("2dEvents.txt", 0); strtok(p2DEventsTXT_Raw, "\r"); strtok(NULL, "\r");