Revamp static actor data. Add missed fields and reformat table.

svn-id: r13837

2 files changed, 199 insertions, 197 deletions

diff --git a/saga/actordata.cpp b/saga/actordata.cpp
index fee8b9d95c..3aedc30397 100644
--- a/saga/actordata.cpp
+++ b/saga/actordata.cpp
@@ -22,7 +22,7 @@
  */
 
 // Actor data table
-
+#include "saga.h"
 #include "actordata.h"
 
 namespace Saga {
@@ -32,191 +32,191 @@ int ActorOrientationLUT[] = { 2, 0, 0, 0, 3, 1, 1, 1 };
 
 R_ACTORTABLE ActorTable[R_ACTORCOUNT] = {
 
-//   namei                         sl_rn si_rn        col
-//   -----                         ----- -----        ---
-	{0, 1, 0, 0, 0, 37, 135, 0, 1, 0, 0, 0},
+//       namei                      sl_rn si_rn    col
+//       -----                      ----- -----    ---
+	{1, 1,  0,   1,    0,    0,   0,  37, 135,  0,   1,  0, 0, 0},
 	// original okk entry
-	// { 1,    0,    0,    0,    0,    0,    0,    1,    132, 0,   0,   0 },
-	{1, 0, 0, 0, 0, 45, 144, 1, 132, 0, 0, 0},
-	{2, 0, 0, 0, 0, 48, 143, 2, 161, 0, 0, 0},
-	{3, 0, 240, 480, 0, 115, 206, 0, 25, 0, 0, 0},
-	{4, 17, 368, 400, 0, 115, 206, 4, 49, 0, 0, 0},
-	{5, 11, 552, 412, 0, 54, 152, 1, 171, 0, 0, 0},
-	{17, 2, 1192, 888, 0, 57, 153, 17, 49, 0, 0, 0},
-	{17, 2, 816, 1052, 0, 57, 153, 18, 49, 0, 0, 0},
-	{17, 2, 928, 932, 0, 58, 153, 19, 49, 0, 0, 0},
-	{17, 2, 1416, 1160, 0, 58, 153, 20, 49, 0, 0, 0},
-	{19, 49, 1592, 1336, 0, 92, 175, 15, 162, 0, 0, 0},
-	{20, 49, 744, 824, 0, 63, 156, 19, 112, 0, 4, 4},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{9, 49, 1560, 1624, 0, 94, 147, 18, 132, 0, 4, 4},
-	{56, 49, 1384, 792, 0, 95, 193, 20, 72, 0, 0, 0},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{19, 0, 1592, 1336, 0, 92, 175, 0, 171, 0, 0, 0},
-	{18, 32, 764, 448, 0, 55, 150, 0, 48, 10, 4, 4},
-	{35, 32, 0, 0, 0, 56, 151, 0, 112, 0, 0, 0},
-	{36, 32, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0},
-	{32, 32, 0, 0, 0, 91, 190, 0, 98, 0, 0, 0},
-	{31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0},
-	{31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0},
-	{31, 32, 0, 0, 0, 90, 189, 0, 171, 0, 0, 0},
-	{31, 32, 0, 0, 0, 79, 172, 0, 18, 0, 0, 0},
-	{21, 50, 664, 400, 0, 76, 171, 2, 74, 0, 4, 4},
-	{21, 50, 892, 428, 0, 76, 171, 2, 74, 0, 4, 4},
-	{9, 51, 904, 936, 0, 51, 145, 35, 5, 0, 0, 0},
-	{9, 51, 872, 840, 0, 51, 145, 36, 5, 0, 0, 0},
-	{9, 51, 1432, 344, 0, 51, 145, 37, 5, 0, 0, 0},
-	{9, 51, 664, 472, 0, 51, 145, 38, 5, 0, 0, 0},
-	{10, 51, 1368, 1464, 0, 80, 146, 39, 147, 0, 0, 0},
-	{10, 51, 1416, 1624, 0, 80, 146, 40, 147, 0, 0, 0},
-	{10, 51, 1752, 120, 0, 80, 146, 41, 147, 0, 0, 0},
-	{10, 51, 984, 408, 0, 80, 146, 42, 147, 0, 0, 0},
-	{14, 52, 856, 376, 0, 82, 174, 8, 73, 0, 0, 0},
-	{14, 52, 808, 664, 0, 82, 174, 9, 73, 0, 0, 0},
-	{14, 52, 440, 568, 0, 82, 174, 10, 73, 0, 0, 0},
-	{14, 52, 392, 776, 0, 82, 174, 11, 73, 0, 0, 0},
-	{21, 4, 240, 384, 0, 79, 172, 0, 18, 0, 2, 2},
-	{23, 4, 636, 268, 0, 77, 173, 0, 74, 0, 4, 4},
-	{22, 4, 900, 320, 0, 78, 179, 0, 60, 0, 4, 4},
-	{14, 4, 788, 264, 0, 75, 170, 0, 171, 0, 2, 2},
-	{14, 4, 1088, 264, 0, 75, 170, 0, 171, 0, 6, 6},
-	{24, 19, 728, 396, 0, 65, 181, 47, 146, 0, 6, 6},
-	{24, 21, -20, -20, 0, 66, 182, 0, 146, 0, 4, 4},
-	{25, 19, 372, 464, 0, 67, 183, 73, 146, 0, 2, 2},
-	{26, 5, 564, 476, 27, 53, 149, 1, 5, 0, 4, 4},
-	{27, 31, 868, 344, 0, 81, 180, 0, 171, 0, 4, 4},
-	{28, 73, 568, 380, 0, 83, 176, 30, 120, 0, 4, 4},
-	{14, 7, 808, 480, 0, 82, 174, 9, 73, 0, 0, 0},
-	{29, 10, 508, 432, 0, 84, 186, 6, 112, 0, 4, 4},
-	{33, 10, 676, 420, 0, 86, 184, 6, 171, 0, 4, 4},
-	{30, 10, 388, 452, 0, 88, 185, 6, 171, 0, 4, 4},
-	{30, 10, 608, 444, 0, 89, 185, 6, 171, 0, 4, 4},
-	{31, 10, 192, 468, 0, 90, 189, 6, 171, 0, 4, 4},
-	{31, 10, 772, 432, 0, 90, 189, 6, 171, 0, 4, 4},
-	{14, 10, 1340, 444, 0, 87, 188, 6, 171, 0, 4, 4},
-	{20, 18, 808, 360, 7, 60, 154, 64, 88, 0, 4, 4},
-	{34, 49, 1128, 1256, 0, 96, 191, 16, 35, 0, 4, 4},
-	{34, 49, 1384, 792, 0, 93, 192, 17, 66, 0, 4, 4},
-	{24, 21, 0, -40, 0, 65, 181, 50, 146, 0, 6, 6},
-	{3, 21, 0, -40, 0, 64, 158, 49, 112, 0, 0, 0},
-	{17, 21, 0, -40, 0, 62, 157, 74, 48, 0, 0, 0},
-	{17, 21, 0, -40, 0, 62, 157, 74, 49, 0, 0, 0},
-	{17, 21, 0, -40, 0, 62, 157, 74, 50, 0, 0, 0},
-	{12, 244, 1056, 504, 0, 107, 167, 21, 124, 0, 6, 6},
-	{8, 33, 248, 440, 0, 68, 169, 14, 112, 0, 0, 0},
-	{11, 23, 308, 424, 0, 106, 166, 6, 48, 0, 2, 2},
-	{17, 2, 1864, 1336, 0, 58, 153, 21, 49, 0, 0, 0},
-	{17, 2, 760, 216, 0, 58, 153, 22, 49, 0, 0, 0},
-	{44, 29, 0, 0, 0, 72, 159, 0, 112, 0, 0, 0},
-	{45, 29, 0, 0, 0, 71, 163, 0, 146, 0, 6, 6},
-	{45, 29, 0, 0, 0, 71, 163, 0, 124, 0, 2, 2},
-	{45, 29, 0, 0, 0, 71, 163, 0, 169, 0, 0, 0},
-	{7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0},
-	{7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0},
-	{7, 257, 552, 408, 0, 70, 165, 0, 4, 0, 2, 2},
-	{7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0},
-	{7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0},
-	{7, 257, 712, 380, 0, 69, 164, 0, 4, 0, 4, 4},
-	{7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0},
-	{7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0},
-	{7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0},
-	{7, 29, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0},
-	{7, 0, 0, 0, 0, 69, 164, 0, 4, 0, 0, 0},
-	{7, 29, 0, 0, 0, 70, 165, 0, 4, 0, 0, 0},
-	{47, 30, 0, 0, 0, 102, 199, 1, 186, 0, 0, 0},
-	{48, 69, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0},
-	{49, 69, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0},
-	{50, 69, 0, 0, 0, 111, 203, 16, 67, 0, 0, 0},
-	{51, 20, 0, 0, 0, 112, 204, 15, 26, 0, 0, 0},
-	{50, 20, 0, 0, 0, 111, 203, 14, 67, 0, 0, 0},
-	{49, 20, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0},
-	{48, 256, 0, 0, 0, 109, 202, 35, 26, 0, 0, 0},
-	{21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0},
-	{21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0},
-	{21, 32, 0, 0, 0, 76, 171, 0, 171, 0, 0, 0},
-	{52, 15, 152, 400, 0, 108, 168, 19, 48, 10, 2, 2},
-	{47, 251, 640, 360, 0, 113, 205, 5, 186, 10, 2, 2},
-	{41, 75, 152, 400, 0, 100, 197, 5, 81, 0, 0, 0},
-	{44, 9, 0, 0, 0, 73, 160, 54, 112, 0, 0, 0},
-	{0, 22, -20, -20, 0, 118, 209, 0, 171, 0, 0, 0},
-	{1, 22, 0, 0, 0, 119, 210, 0, 171, 0, 0, 0},
-	{0, 22, -20, -20, 0, 118, 209, 0, 171, 0, 0, 0},
-	{1, 22, 0, 0, 0, 119, 210, 0, 171, 0, 0, 0},
-	{53, 42, 640, 400, 0, 104, 201, 8, 141, 0, 0, 0},
-	{54, 21, -20, -20, 0, 120, 211, 48, 238, 0, 0, 0},
-	{0, 4, -20, -20, 0, 42, 140, 0, 1, 0, 0, 0},
-	{26, 5, -20, -20, 27, 52, 148, 1, 5, 0, 4, 4},
-	{36, 4, -20, -20, 0, 116, 207, 0, 155, 0, 0, 0},
-	{36, 0, -20, -20, 0, 117, 208, 0, 155, 0, 0, 0},
-	{46, 252, -20, -20, 0, 74, 162, 29, 34, 0, 0, 0},
-	{0, 32, -20, -20, 0, 41, 137, 0, 1, 0, 0, 0},
-	{0, 259, -20, -20, 0, 44, 138, 0, 1, 0, 0, 0},
-	{0, 5, -20, -20, 0, 43, 139, 0, 1, 0, 0, 0},
-	{0, 31, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0},
-	{0, 252, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0},
-	{0, 15, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0},
-	{0, 20, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0},
-	{0, 25, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0},
-	{0, 272, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0},
-	{0, 50, -20, -20, 0, 39, 136, 0, 1, 0, 0, 0},
-	{50, 71, -20, -20, 0, 111, 203, 0, 67, 0, 0, 0},
-	{50, 274, -20, -20, 0, 111, 203, 0, 67, 0, 0, 0},
-	{50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0},
-	{50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0},
-	{50, 274, -20, -20, 0, 110, 212, 0, 171, 0, 0, 0},
-	{57, 272, 909, 909, 48, 121, 213, 0, 171, 0, 0, 0},
-	{58, 15, -20, -20, 0, 122, 214, 0, 171, 0, 0, 0},
-	{37, 246, -20, -20, 0, 97, 194, 0, 141, 0, 0, 0},
-	{38, 246, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0},
-	{59, 246, -20, -20, 0, 103, 200, 0, 26, 0, 0, 0},
-	{41, 245, -20, -20, 0, 100, 197, 0, 81, 0, 0, 0},
-	{47, 250, 640, 360, 0, 114, 205, 0, 186, 10, 2, 2},
-	{0, 278, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0},
-	{0, 272, -20, -20, 0, 40, 141, 0, 1, 0, 0, 0},
-	{41, 77, -20, -20, 0, 100, 197, 24, 81, 0, 0, 0},
-	{37, 261, -20, -20, 0, 97, 194, 0, 141, 0, 0, 0},
-	{38, 261, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0},
-	{39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0},
-	{39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0},
-	{39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0},
-	{39, 261, -20, -20, 0, 99, 196, 0, 5, 0, 0, 0},
-	{59, 279, -20, -20, 0, 103, 200, 0, 26, 0, 0, 0},
-	{38, 279, -20, -20, 0, 98, 195, 0, 27, 0, 0, 0},
-	{42, 77, -20, -20, 0, 101, 198, 25, 171, 0, 0, 0},
-	{59, 281, -20, -20, 0, 103, 200, 26, 26, 0, 0, 0},
-	{59, 279, -20, -20, 0, 123, 215, 0, 1, 0, 0, 0},
-	{59, 279, -20, -20, 0, 123, 215, 0, 132, 0, 0, 0},
-	{59, 279, -20, -20, 0, 123, 215, 0, 161, 0, 0, 0},
-	{54, 279, -20, -20, 0, 120, 211, 0, 133, 0, 6, 6},
-	{44, 9, -20, -20, 0, 124, 161, 0, 171, 0, 6, 6},
-	{7, 255, 588, 252, 0, 70, 165, 0, 3, 0, 2, 2},
-	{7, 255, 696, 252, 0, 70, 165, 0, 5, 0, 6, 6},
-	{36, 4, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0},
-	{44, 272, 1124, 1124, 120, 72, 159, 0, 112, 0, 0, 0},
-	{7, 272, 1124, 1108, 120, 70, 165, 0, 4, 0, 0, 0},
-	{7, 272, 1108, 1124, 120, 70, 165, 0, 4, 0, 0, 0},
-	{29, 288, 508, 432, 0, 85, 187, 0, 112, 0, 4, 4},
-	{29, 0, 508, 432, 0, 84, 186, 0, 99, 0, 4, 4},
-	{29, 0, 508, 432, 0, 84, 186, 0, 98, 0, 4, 4},
-	{29, 0, 508, 432, 0, 84, 186, 0, 104, 0, 4, 4},
-	{29, 0, 508, 432, 0, 84, 186, 0, 99, 0, 4, 4},
-	{36, 288, 0, 0, 0, 105, 142, 0, 155, 0, 0, 0},
-	{1, 27, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0},
-	{1, 252, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0},
-	{1, 25, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0},
-	{1, 259, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0},
-	{1, 279, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0},
-	{1, 273, -20, -20, 0, 47, 178, 0, 132, 0, 0, 0},
-	{1, 26, -20, -20, 0, 8, 178, 0, 171, 0, 0, 0},
-	{1, 0, -20, -20, 0, 0, 0, 0, 50, 0, 0, 0},
-	{1, 0, -20, -20, 0, 0, 0, 0, 82, 0, 0, 0},
-	{1, 0, -20, -20, 0, 0, 0, 0, 35, 0, 0, 0},
-	{9, 74, -20, -20, 0, 51, 145, 0, 5, 0, 0, 0}
+//  {1, 2,  1,   0,    0,    0,   0,   0,   0,  1, 132,  0, 0, 0},
+	{1, 2,  1,   0,    0,    0,   0,  45, 144,  1, 132,  0, 0, 0},
+	{1, 2,  2,   0,    0,    0,   0,  48, 143,  2, 161,  0, 0, 0},
+	{1, 0,  3,   0,  240,  480,   0, 115, 206,  0,  25,  0, 0, 0},
+	{1, 0,  4,  17,  368,  400,   0, 115, 206,  4,  49,  0, 0, 0},
+	{1, 0,  5,  11,  552,  412,   0,  54, 152,  1, 171,  0, 0, 0},
+	{1, 0, 17,   2, 1192,  888,   0,  57, 153, 17,  49,  0, 0, 0},
+	{1, 0, 17,   2,  816, 1052,   0,  57, 153, 18,  49,  0, 0, 0},
+	{1, 0, 17,   2,  928,  932,   0,  58, 153, 19,  49,  0, 0, 0},
+	{1, 0, 17,   2, 1416, 1160,   0,  58, 153, 20,  49,  0, 0, 0},
+	{1, 0, 19,  49, 1592, 1336,   0,  92, 175, 15, 162,  0, 0, 0},
+	{1, 0, 20,  49,  744,  824,   0,  63, 156, 19, 112,  0, 4, 4},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0,  9,  49, 1560, 1624,   0,  94, 147, 18, 132,  0, 4, 4},
+	{1, 0, 56,  49, 1384,  792,   0,  95, 193, 20,  72,  0, 0, 0},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0, 19,   0, 1592, 1336,   0,  92, 175,  0, 171,  0, 0, 0},
+	{1, 0, 18,  32,  764,  448,   0,  55, 150,  0,  48, 10, 4, 4},
+	{1, 0, 35,  32,    0,    0,   0,  56, 151,  0, 112,  0, 0, 0},
+	{1, 0, 36,  32,    0,    0,   0, 105, 142,  0, 155,  0, 0, 0},
+	{1, 0, 32,  32,    0,    0,   0,  91, 190,  0,  98,  0, 0, 0},
+	{1, 0, 31,  32,    0,    0,   0,  90, 189,  0, 171,  0, 0, 0},
+	{1, 0, 31,  32,    0,    0,   0,  90, 189,  0, 171,  0, 0, 0},
+	{1, 0, 31,  32,    0,    0,   0,  90, 189,  0, 171,  0, 0, 0},
+	{1, 0, 31,  32,    0,    0,   0,  79, 172,  0,  18,  0, 0, 0},
+	{1, 0, 21,  50,  664,  400,   0,  76, 171,  2,  74,  0, 4, 4},
+	{1, 0, 21,  50,  892,  428,   0,  76, 171,  2,  74,  0, 4, 4},
+	{1, 0,  9,  51,  904,  936,   0,  51, 145, 35,   5,  0, 0, 0},
+	{1, 0,  9,  51,  872,  840,   0,  51, 145, 36,   5,  0, 0, 0},
+	{1, 0,  9,  51, 1432,  344,   0,  51, 145, 37,   5,  0, 0, 0},
+	{1, 0,  9,  51,  664,  472,   0,  51, 145, 38,   5,  0, 0, 0},
+	{1, 0, 10,  51, 1368, 1464,   0,  80, 146, 39, 147,  0, 0, 0},
+	{1, 0, 10,  51, 1416, 1624,   0,  80, 146, 40, 147,  0, 0, 0},
+	{1, 0, 10,  51, 1752,  120,   0,  80, 146, 41, 147,  0, 0, 0},
+	{1, 0, 10,  51,  984,  408,   0,  80, 146, 42, 147,  0, 0, 0},
+	{1, 0, 14,  52,  856,  376,   0,  82, 174,  8,  73,  0, 0, 0},
+	{1, 0, 14,  52,  808,  664,   0,  82, 174,  9,  73,  0, 0, 0},
+	{1, 0, 14,  52,  440,  568,   0,  82, 174, 10,  73,  0, 0, 0},
+	{1, 0, 14,  52,  392,  776,   0,  82, 174, 11,  73,  0, 0, 0},
+	{1, 0, 21,   4,  240,  384,   0,  79, 172,  0,  18,  0, 2, 2},
+	{1, 0, 23,   4,  636,  268,   0,  77, 173,  0,  74,  0, 4, 4},
+	{1, 0, 22,   4,  900,  320,   0,  78, 179,  0,  60,  0, 4, 4},
+	{1, 0, 14,   4,  788,  264,   0,  75, 170,  0, 171,  0, 2, 2},
+	{1, 0, 14,   4, 1088,  264,   0,  75, 170,  0, 171,  0, 6, 6},
+	{1, 0, 24,  19,  728,  396,   0,  65, 181, 47, 146,  0, 6, 6},
+	{1, 0, 24,  21,  -20,  -20,   0,  66, 182,  0, 146,  0, 4, 4},
+	{1, 4, 25,  19,  372,  464,   0,  67, 183, 73, 146,  0, 2, 2},
+	{1, 0, 26,   5,  564,  476,  27,  53, 149,  1,   5,  0, 4, 4},
+	{1, 4, 27,  31,  868,  344,   0,  81, 180,  0, 171,  0, 4, 4},
+	{1, 0, 28,  73,  568,  380,   0,  83, 176, 30, 120,  0, 4, 4},
+	{1, 0, 14,   7,  808,  480,   0,  82, 174,  9,  73,  0, 0, 0},
+	{1, 0, 29,  10,  508,  432,   0,  84, 186,  6, 112,  0, 4, 4},
+	{1, 0, 33,  10,  676,  420,   0,  86, 184,  6, 171,  0, 4, 4},
+	{1, 0, 30,  10,  388,  452,   0,  88, 185,  6, 171,  0, 4, 4},
+	{1, 0, 30,  10,  608,  444,   0,  89, 185,  6, 171,  0, 4, 4},
+	{1, 0, 31,  10,  192,  468,   0,  90, 189,  6, 171,  0, 4, 4},
+	{1, 0, 31,  10,  772,  432,   0,  90, 189,  6, 171,  0, 4, 4},
+	{1, 0, 14,  10, 1340,  444,   0,  87, 188,  6, 171,  0, 4, 4},
+	{1, 0, 20,  18,  808,  360,   7,  60, 154, 64,  88,  0, 4, 4},
+	{1, 0, 34,  49, 1128, 1256,   0,  96, 191, 16,  35,  0, 4, 4},
+	{1, 0, 34,  49, 1384,  792,   0,  93, 192, 17,  66,  0, 4, 4},
+	{1, 0, 24,  21,    0,  -40,   0,  65, 181, 50, 146,  0, 6, 6},
+	{1, 0,  3,  21,    0,  -40,   0,  64, 158, 49, 112,  0, 0, 0},
+	{1, 0, 17,  21,    0,  -40,   0,  62, 157, 74,  48,  0, 0, 0},
+	{1, 0, 17,  21,    0,  -40,   0,  62, 157, 74,  49,  0, 0, 0},
+	{1, 0, 17,  21,    0,  -40,   0,  62, 157, 74,  50,  0, 0, 0},
+	{1, 0, 12, 244, 1056,  504,   0, 107, 167, 21, 124,  0, 6, 6},
+	{1, 0,  8,  33,  248,  440,   0,  68, 169, 14, 112,  0, 0, 0},
+	{1, 0, 11,  23,  308,  424,   0, 106, 166,  6,  48,  0, 2, 2},
+	{1, 0, 17,   2, 1864, 1336,   0,  58, 153, 21,  49,  0, 0, 0},
+	{1, 0, 17,   2,  760,  216,   0,  58, 153, 22,  49,  0, 0, 0},
+	{1, 0, 44,  29,    0,    0,   0,  72, 159,  0, 112,  0, 0, 0},
+	{1, 0, 45,  29,    0,    0,   0,  71, 163,  0, 146,  0, 6, 6},
+	{1, 0, 45,  29,    0,    0,   0,  71, 163,  0, 124,  0, 2, 2},
+	{1, 0, 45,  29,    0,    0,   0,  71, 163,  0, 169,  0, 0, 0},
+	{1, 0,  7,  29,    0,    0,   0,  69, 164,  0,   4,  0, 0, 0},
+	{1, 0,  7,  29,    0,    0,   0,  70, 165,  0,   4,  0, 0, 0},
+	{1, 0,  7, 257,  552,  408,   0,  70, 165,  0,   4,  0, 2, 2},
+	{1, 0,  7,  29,    0,    0,   0,  70, 165,  0,   4,  0, 0, 0},
+	{1, 0,  7,  29,    0,    0,   0,  70, 165,  0,   4,  0, 0, 0},
+	{1, 0,  7, 257,  712,  380,   0,  69, 164,  0,   4,  0, 4, 4},
+	{1, 0,  7,  29,    0,    0,   0,  69, 164,  0,   4,  0, 0, 0},
+	{1, 0,  7,  29,    0,    0,   0,  69, 164,  0,   4,  0, 0, 0},
+	{1, 0,  7,  29,    0,    0,   0,  69, 164,  0,   4,  0, 0, 0},
+	{1, 0,  7,  29,    0,    0,   0,  69, 164,  0,   4,  0, 0, 0},
+	{1, 0,  7,   0,    0,    0,   0,  69, 164,  0,   4,  0, 0, 0},
+	{1, 0,  7,  29,    0,    0,   0,  70, 165,  0,   4,  0, 0, 0},
+	{1, 0, 47,  30,    0,    0,   0, 102, 199,  1, 186,  0, 0, 0},
+	{1, 0, 48,  69,    0,    0,   0, 109, 202, 35,  26,  0, 0, 0},
+	{1, 0, 49,  69,    0,    0,   0, 109, 202, 35,  26,  0, 0, 0},
+	{1, 0, 50,  69,    0,    0,   0, 111, 203, 16,  67,  0, 0, 0},
+	{1, 0, 51,  20,    0,    0,   0, 112, 204, 15,  26,  0, 0, 0},
+	{1, 0, 50,  20,    0,    0,   0, 111, 203, 14,  67,  0, 0, 0},
+	{1, 0, 49,  20,    0,    0,   0, 109, 202, 35,  26,  0, 0, 0},
+	{1, 0, 48, 256,    0,    0,   0, 109, 202, 35,  26,  0, 0, 0},
+	{1, 0, 21,  32,    0,    0,   0,  76, 171,  0, 171,  0, 0, 0},
+	{1, 0, 21,  32,    0,    0,   0,  76, 171,  0, 171,  0, 0, 0},
+	{1, 0, 21,  32,    0,    0,   0,  76, 171,  0, 171,  0, 0, 0},
+	{1, 0, 52,  15,  152,  400,   0, 108, 168, 19,  48, 10, 2, 2},
+	{1, 0, 47, 251,  640,  360,   0, 113, 205,  5, 186, 10, 2, 2},
+	{1, 0, 41,  75,  152,  400,   0, 100, 197,  5,  81,  0, 0, 0},
+	{1, 0, 44,   9,    0,    0,   0,  73, 160, 54, 112,  0, 0, 0},
+	{1, 0,  0,  22,  -20,  -20,   0, 118, 209,  0, 171,  0, 0, 0},
+	{1, 0,  1,  22,    0,    0,   0, 119, 210,  0, 171,  0, 0, 0},
+	{1, 0,  0,  22,  -20,  -20,   0, 118, 209,  0, 171,  0, 0, 0},
+	{1, 0,  1,  22,    0,    0,   0, 119, 210,  0, 171,  0, 0, 0},
+	{1, 0, 53,  42,  640,  400,   0, 104, 201,  8, 141,  0, 0, 0},
+	{1, 0, 54,  21,  -20,  -20,   0, 120, 211, 48, 238,  0, 0, 0},
+	{1, 0,  0,   4,  -20,  -20,   0,  42, 140,  0,   1,  0, 0, 0},
+	{1, 0, 26,   5,  -20,  -20,  27,  52, 148,  1,   5,  0, 4, 4},
+	{1, 0, 36,   4,  -20,  -20,   0, 116, 207,  0, 155,  0, 0, 0},
+	{1, 0, 36,   0,  -20,  -20,   0, 117, 208,  0, 155,  0, 0, 0},
+	{1, 0, 46, 252,  -20,  -20,   0,  74, 162, 29,  34,  0, 0, 0},
+	{1, 0,  0,  32,  -20,  -20,   0,  41, 137,  0,   1,  0, 0, 0},
+	{1, 0,  0, 259,  -20,  -20,   0,  44, 138,  0,   1,  0, 0, 0},
+	{1, 0,  0,   5,  -20,  -20,   0,  43, 139,  0,   1,  0, 0, 0},
+	{1, 0,  0,  31,  -20,  -20,   0,  39, 136,  0,   1,  0, 0, 0},
+	{1, 0,  0, 252,  -20,  -20,   0,  39, 136,  0,   1,  0, 0, 0},
+	{1, 0,  0,  15,  -20,  -20,   0,  39, 136,  0,   1,  0, 0, 0},
+	{1, 0,  0,  20,  -20,  -20,   0,  39, 136,  0,   1,  0, 0, 0},
+	{1, 0,  0,  25,  -20,  -20,   0,  39, 136,  0,   1,  0, 0, 0},
+	{1, 0,  0, 272,  -20,  -20,   0,  40, 141,  0,   1,  0, 0, 0},
+	{1, 0,  0,  50,  -20,  -20,   0,  39, 136,  0,   1,  0, 0, 0},
+	{1, 0, 50,  71,  -20,  -20,   0, 111, 203,  0,  67,  0, 0, 0},
+	{1, 0, 50, 274,  -20,  -20,   0, 111, 203,  0,  67,  0, 0, 0},
+	{1, 0, 50, 274,  -20,  -20,   0, 110, 212,  0, 171,  0, 0, 0},
+	{1, 0, 50, 274,  -20,  -20,   0, 110, 212,  0, 171,  0, 0, 0},
+	{1, 0, 50, 274,  -20,  -20,   0, 110, 212,  0, 171,  0, 0, 0},
+	{1, 0, 57, 272,  909,  909,  48, 121, 213,  0, 171,  0, 0, 0},
+	{1, 0, 58,  15,  -20,  -20,   0, 122, 214,  0, 171,  0, 0, 0},
+	{1, 0, 37, 246,  -20,  -20,   0,  97, 194,  0, 141,  0, 0, 0},
+	{1, 0, 38, 246,  -20,  -20,   0,  98, 195,  0,  27,  0, 0, 0},
+	{1, 0, 59, 246,  -20,  -20,   0, 103, 200,  0,  26,  0, 0, 0},
+	{1, 0, 41, 245,  -20,  -20,   0, 100, 197,  0,  81,  0, 0, 0},
+	{1, 0, 47, 250,  640,  360,   0, 114, 205,  0, 186, 10, 2, 2},
+	{1, 0,  0, 278,  -20,  -20,   0,  40, 141,  0,   1,  0, 0, 0},
+	{1, 0,  0, 272,  -20,  -20,   0,  40, 141,  0,   1,  0, 0, 0},
+	{1, 0, 41,  77,  -20,  -20,   0, 100, 197, 24,  81,  0, 0, 0},
+	{1, 0, 37, 261,  -20,  -20,   0,  97, 194,  0, 141,  0, 0, 0},
+	{1, 0, 38, 261,  -20,  -20,   0,  98, 195,  0,  27,  0, 0, 0},
+	{1, 0, 39, 261,  -20,  -20,   0,  99, 196,  0,   5,  0, 0, 0},
+	{1, 0, 39, 261,  -20,  -20,   0,  99, 196,  0,   5,  0, 0, 0},
+	{1, 0, 39, 261,  -20,  -20,   0,  99, 196,  0,   5,  0, 0, 0},
+	{1, 0, 39, 261,  -20,  -20,   0,  99, 196,  0,   5,  0, 0, 0},
+	{1, 0, 59, 279,  -20,  -20,   0, 103, 200,  0,  26,  0, 0, 0},
+	{1, 0, 38, 279,  -20,  -20,   0,  98, 195,  0,  27,  0, 0, 0},
+	{1, 0, 42,  77,  -20,  -20,   0, 101, 198, 25, 171,  0, 0, 0},
+	{1, 0, 59, 281,  -20,  -20,   0, 103, 200, 26,  26,  0, 0, 0},
+	{1, 0, 59, 279,  -20,  -20,   0, 123, 215,  0,   1,  0, 0, 0},
+	{1, 0, 59, 279,  -20,  -20,   0, 123, 215,  0, 132,  0, 0, 0},
+	{1, 0, 59, 279,  -20,  -20,   0, 123, 215,  0, 161,  0, 0, 0},
+	{1, 0, 54, 279,  -20,  -20,   0, 120, 211,  0, 133,  0, 6, 6},
+	{1, 0, 44,   9,  -20,  -20,   0, 124, 161,  0, 171,  0, 6, 6},
+	{1, 0,  7, 255,  588,  252,   0,  70, 165,  0,   3,  0, 2, 2},
+	{1, 0,  7, 255,  696,  252,   0,  70, 165,  0,   5,  0, 6, 6},
+	{1, 0, 36,   4,    0,    0,   0, 105, 142,  0, 155,  0, 0, 0},
+	{1, 0, 44, 272, 1124, 1124, 120,  72, 159,  0, 112,  0, 0, 0},
+	{1, 0,  7, 272, 1124, 1108, 120,  70, 165,  0,   4,  0, 0, 0},
+	{1, 0,  7, 272, 1108, 1124, 120,  70, 165,  0,   4,  0, 0, 0},
+	{1, 0, 29, 288,  508,  432,   0,  85, 187,  0, 112,  0, 4, 4},
+	{1, 0, 29,   0,  508,  432,   0,  84, 186,  0,  99,  0, 4, 4},
+	{1, 0, 29,   0,  508,  432,   0,  84, 186,  0,  98,  0, 4, 4},
+	{1, 0, 29,   0,  508,  432,   0,  84, 186,  0, 104,  0, 4, 4},
+	{1, 0, 29,   0,  508,  432,   0,  84, 186,  0,  99,  0, 4, 4},
+	{1, 0, 36, 288,    0,    0,   0, 105, 142,  0, 155,  0, 0, 0},
+	{1, 0,  1,  27,  -20,  -20,   0,  47, 178,  0, 132,  0, 0, 0},
+	{1, 0,  1, 252,  -20,  -20,   0,  47, 178,  0, 132,  0, 0, 0},
+	{1, 0,  1,  25,  -20,  -20,   0,  47, 178,  0, 132,  0, 0, 0},
+	{1, 0,  1, 259,  -20,  -20,   0,  47, 178,  0, 132,  0, 0, 0},
+	{1, 0,  1, 279,  -20,  -20,   0,  47, 178,  0, 132,  0, 0, 0},
+	{1, 0,  1, 273,  -20,  -20,   0,  47, 178,  0, 132,  0, 0, 0},
+	{1, 0,  1,  26,  -20,  -20,   0,   8, 178,  0, 171,  0, 0, 0},
+	{1, 0,  1,   0,  -20,  -20,   0,   0,   0,  0,  50,  0, 0, 0},
+	{1, 0,  1,   0,  -20,  -20,   0,   0,   0,  0,  82,  0, 0, 0},
+	{1, 0,  1,   0,  -20,  -20,   0,   0,   0,  0,  35,  0, 0, 0},
+	{1, 0,  9,  74,  -20,  -20,   0,  51, 145,  0,   5,  0, 0, 0}
 };
 
 } // End of namespace Saga
diff --git a/saga/actordata.h b/saga/actordata.h
index a63af88076..c85a5c087f 100644
--- a/saga/actordata.h
+++ b/saga/actordata.h
@@ -29,18 +29,20 @@
 namespace Saga {
 
 struct R_ACTORTABLE {
-	int name_index;
-	int unknown1;
-	int unknown2;
-	int unknown3;
-	int unknown4;
-	int spritelist_rn;
-	int spriteindex_rn;
-	int unknown5;
-	unsigned char color;
-	unsigned char unknown6;
-	unsigned char unknown7;
-	unsigned char unknown8;
+	byte unknown9;
+	byte unknown10;
+	byte name_index;
+	int32 unknown1;
+	int16 unknown2; // x
+	int16 unknown3; // y
+	int16 unknown4;
+	int32 spritelist_rn;
+	int32 spriteindex_rn;
+	byte unknown5;
+	byte color;
+	byte unknown6;
+	byte unknown7;
+	byte unknown8;
 };
 
 #define R_ACTORCOUNT 181