Demo work (#786)

* Demo work

* Fix PAL

* Fix d_door weak func order and link it

* Fix d_door for demo

* JKernel OK on demo + misc

* tag_attention 100% on demo

* More demo work and fix some retail fakematches

1 files changed, 15 insertions, 3 deletions

diff --git a/src/d/d_s_actor_data_mng.cpp b/src/d/d_s_actor_data_mng.cpp
index 8f3ac628..74c99993 100644
--- a/src/d/d_s_actor_data_mng.cpp
+++ b/src/d/d_s_actor_data_mng.cpp
@@ -115,8 +115,20 @@ void dADM::SetData(void* pData) {
         pHeader += 3;
     }
 
-    if (FindTag('ACFN', &row, &rowOffs) && FindTag('ACNA', &name, &nameOffs) && FindTag('ACDS', &dat_size, &dataOffs)) {
-        JUT_ASSERT(202, row * name == dat_size);
-        mCharTbl.SetData((u32)pData, row, rowOffs, name, nameOffs, dat_size, dataOffs);
+    u32 tag;
+    tag = 'ACFN';
+    if (!FindTag(tag, &row, &rowOffs)) {
+        return;
     }
+    tag = 'ACNA';
+    if (!FindTag(tag, &name, &nameOffs)) {
+        return;
+    }
+    tag = 'ACDS';
+    if (!FindTag(tag, &dat_size, &dataOffs)) {
+        return;
+    }
+
+    JUT_ASSERT(202, row * name == dat_size);
+    mCharTbl.SetData((u32)pData, row, rowOffs, name, nameOffs, dat_size, dataOffs);
 }