--- a/Player.cpp	Tue Feb 05 19:08:22 2013 +0600
+++ b/Player.cpp	Tue Feb 05 19:08:52 2013 +0600
@@ -18,7 +18,8 @@
 #include "Events2D.h"
 #include "Outdoor.h"
 #include "StorylineTextTable.h"
-
+#include "Autonotes.h"
+#include "Awards.h"
 #include "mm7_data.h"
 
 
@@ -8413,12 +8414,13 @@
   if ( var == VAR_AutoNotes )
   {
     if ( !((unsigned __int8)(0x80u >> ((signed __int16)a3 - 1) % 8) & pParty->_autonote_bits[((signed __int16)a3 - 1) >> 3])
-      && (&dword_723718_autonote_related)[8 * a3] )
+      //&& (&dword_723718_autonote_related)[8 * a3] )
+	  && pAutonoteTxt[a3-1].pText )
     {
       v20 = pPlayers[v3 + 1];
       v30 = 1;
       v20->PlaySound(96, 0);
-      v21 = dword_72371C[2 * a3];
+	  v21 = pAutonoteTxt[a3-1].eType;// dword_72371C[2 * a3];
       bFlashAutonotesBook = 1;
       dword_506568 = v21;
     }
@@ -8482,7 +8484,8 @@
           return;
         case VAR_Award:
           if ( !((unsigned __int8)(0x80u >> ((signed __int16)a3 - 1) % 8) & pPlayers[v3 + 1]->field_152[((signed __int16)a3 - 1) >> 3])
-            && dword_723E80_award_related[2 * a3] )
+            //&& dword_723E80_award_related[2 * a3] )
+			&& pAwards[a3-1].pText )
           {
             v12 = pPlayers[v3 + 1];
             v30 = 1;
@@ -8496,7 +8499,8 @@
           goto LABEL_124;
         case VAR_QBits_QuestsDone:
           if ( !((unsigned __int8)(0x80u >> ((signed __int16)a3 - 1) % 8) & pParty->_award_bits[((signed __int16)a3 - 1) >> 3])
-            && (&dword_722F10)[4 * a3] )
+           // && (&dword_722F10)[4 * a3] )
+		   && pQuestTable[a3-1] )
           {
             v14 = pPlayers[v3 + 1];
             bFlashQuestBook = 1;
@@ -8909,7 +8913,8 @@
               v13 = pPlayers[uPlayerIdx + 1];
               v33 = 0x80u >> ((signed __int16)val - 1) % 8;
               if ( !((unsigned __int8)(0x80u >> ((signed __int16)val - 1) % 8) & v13->field_152[((signed __int16)val - 1) >> 3])
-                && dword_723E80_award_related[2 * val] )
+                //&& dword_723E80_award_related[2 * val] )
+				&& pAwards[val-1].pText )
               {
                 v14 = pPlayers[uPlayerIdx + 1];
                 v34 = 1;
@@ -8927,7 +8932,8 @@
               goto _play_anim_and_exit;
             case VAR_QBits_QuestsDone:
               if ( !((unsigned __int8)(0x80u >> ((signed __int16)val - 1) % 8) & pParty->_award_bits[((signed __int16)val - 1) >> 3])
-                && (&dword_722F10)[4 * val] )
+                //&& (&dword_722F10)[4 * val] )
+				&& pQuestTable[val-1] )
               {
                 v17 = pPlayers[uPlayerIdx + 1];
                 bFlashQuestBook = 1;
@@ -9191,12 +9197,13 @@
       goto _play_sound;
     }
     if ( !((unsigned __int8)(0x80u >> ((signed __int16)val - 1) % 8) & pParty->_autonote_bits[((signed __int16)val - 1) >> 3])
-      && (&dword_723718_autonote_related)[8 * val] )
+      //&& (&dword_723718_autonote_related)[8 * val] )
+	  && pAutonoteTxt[val-1].pText )
     {
       v23 = pPlayers[uPlayerIdx + 1];
       v34 = 1;
       v23->PlaySound(96, 0);
-      v24 = dword_72371C[2 * val];
+	  v24 = pAutonoteTxt[val-1].eType;//dword_72371C[2 * val];
       bFlashAutonotesBook = 1;
       dword_506568 = v24;
     }