Mercurial > mm7
comparison mm7_4.cpp @ 81:377535d6e366
structure boundaries fixed in many places. fixed quests, notes, awards, calendar.
author | zipi |
---|---|
date | Sun, 03 Feb 2013 15:36:54 +0000 |
parents | 653fdf29c654 |
children | 170259c8c71f |
comparison
equal
deleted
inserted
replaced
80:48f69ae3bc8d | 81:377535d6e366 |
---|---|
5040 if ( dword_A74CDC == -1 ) | 5040 if ( dword_A74CDC == -1 ) |
5041 { | 5041 { |
5042 v24 = v23; | 5042 v24 = v23; |
5043 dword_A74CDC = v23; | 5043 dword_A74CDC = v23; |
5044 } | 5044 } |
5045 v11 = (char *)dword_723E80_award_related[2 * v55[v24]]; | 5045 v11 = (char *)pAwards[v55[v24]-1].pText;//(char *)dword_723E80_award_related[2 * v55[v24]]; |
5046 } | 5046 } |
5047 else | 5047 else |
5048 { | 5048 { |
5049 v11 = (char *)pNPCTopics[55].pText; | 5049 v11 = (char *)pNPCTopics[55].pText; |
5050 } | 5050 } |
10296 { | 10296 { |
10297 if ( v17 == 24 ) | 10297 if ( v17 == 24 ) |
10298 { | 10298 { |
10299 v23 = v58->evtf; | 10299 v23 = v58->evtf; |
10300 LABEL_33: | 10300 LABEL_33: |
10301 v15 = (&dword_721660)[8 * v23]; | 10301 v15 = (char *)pNPCTopics[v23-1].pTopic;//(&dword_721660)[8 * v23]; |
10302 if ( !v15 ) | 10302 if ( !v15 ) |
10303 { | 10303 { |
10304 v16->uControlParam = 0; | 10304 v16->uControlParam = 0; |
10305 v15 = ""; | 10305 v15 = ""; |
10306 } | 10306 } |
10316 goto LABEL_33; | 10316 goto LABEL_33; |
10317 } | 10317 } |
10318 v20 = v19 - 1; | 10318 v20 = v19 - 1; |
10319 if ( !v20 ) | 10319 if ( !v20 ) |
10320 { | 10320 { |
10321 v15 = (&dword_721660)[8 * v58->evtb]; | 10321 v15 = (char *)pNPCTopics[v58->evtb-1].pTopic;//(&dword_721660)[8 * v58->evtb]; |
10322 if ( !v15 ) | 10322 if ( !v15 ) |
10323 { | 10323 { |
10324 v16->uControlParam = 0; | 10324 v16->uControlParam = 0; |
10325 v15 = ""; | 10325 v15 = ""; |
10326 } | 10326 } |