comparison UI/UIHouses.cpp @ 2376:bcd7fadbf7d2

Слияние
author Ritor1
date Mon, 12 May 2014 12:28:06 +0600
parents bddcaf5d5db2
children 802460e60eee
comparison
equal deleted inserted replaced
2375:14c05b876218 2376:bcd7fadbf7d2
3085 bool break_loop; 3085 bool break_loop;
3086 unsigned int temp_str_len; 3086 unsigned int temp_str_len;
3087 char* tmp_pos; 3087 char* tmp_pos;
3088 int decode_step; 3088 int decode_step;
3089 3089
3090 if ( p2DEventsTXT_Raw ) 3090 free(p2DEventsTXT_Raw);
3091 free(p2DEventsTXT_Raw);
3092 p2DEventsTXT_Raw = NULL;
3093 p2DEventsTXT_Raw = (char *)pEvents_LOD->LoadRaw("2dEvents.txt", 0); 3091 p2DEventsTXT_Raw = (char *)pEvents_LOD->LoadRaw("2dEvents.txt", 0);
3094 strtok(p2DEventsTXT_Raw, "\r"); 3092 strtok(p2DEventsTXT_Raw, "\r");
3095 strtok(NULL, "\r"); 3093 strtok(NULL, "\r");
3096 3094
3097 for (i=0;i<525;++i) 3095 for (i=0;i<525;++i)