diff mm7_4.cpp @ 87:170259c8c71f

Слияние
author Ritor1
date Mon, 04 Feb 2013 09:17:49 +0600
parents ec84db4c8f9d 377535d6e366
children 98cd93e14777
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Feb 04 09:17:35 2013 +0600
+++ b/mm7_4.cpp	Mon Feb 04 09:17:49 2013 +0600
@@ -5047,7 +5047,7 @@
                 v24 = v23;
                 dword_A74CDC = v23;
               }
-              v11 = (char *)dword_723E80_award_related[2 * v55[v24]];
+              v11 = (char *)pAwards[v55[v24]-1].pText;//(char *)dword_723E80_award_related[2 * v55[v24]];
             }
             else
             {
@@ -10303,7 +10303,7 @@
         {
           v23 = v58->evtf;
 LABEL_33:
-          v15 = (&dword_721660)[8 * v23];
+          v15 = (char *)pNPCTopics[v23-1].pTopic;//(&dword_721660)[8 * v23];
           if ( !v15 )
           {
             v16->uControlParam = 0;
@@ -10323,7 +10323,7 @@
           v20 = v19 - 1;
           if ( !v20 )
           {
-            v15 = (&dword_721660)[8 * v58->evtb];
+			v15 = (char *)pNPCTopics[v58->evtb-1].pTopic;//(&dword_721660)[8 * v58->evtb];
             if ( !v15 )
             {
               v16->uControlParam = 0;