Merge pull request FoxdieTeam#2133 from KieronJ/target

Renames for TARGET

Author: KieronJ

build/functions.txt

@@ -1115,7 +1115,7 @@
 8004E41C 60 sna_sub_8004E41C
 8004E458 104 sub_8004E458
 8004E4C0 92 sub_8004E4C0
-8004E51C 108 sub_8004E51C
+8004E51C 108 sna_line_check
 8004E588 96 sub_8004E588
 8004E5E8 308 sub_8004E5E8
 8004E71C 236 sna_8004E71C

source/bullet/bakudan.c

@@ -80,7 +80,7 @@ static void Act(BakudanWork *work)
         work->map_index = target->map;
 
         // if the target is not alive, destroy the actor
-        if (!target->field_20)
+        if (!target->body)
         {
             GV_DestroyActor(&work->actor);
             return;

source/bullet/blast.c

@@ -10,6 +10,7 @@
 #include "anime/animconv/anime.h"
 #include "game/game.h"
 #include "sd/g_sound.h"
+#include "linkvar.h"
 #include "strcode.h"
 
 /*---------------------------------------------------------------------------*/
@@ -31,14 +32,14 @@ typedef struct _Work
 /*---------------------------------------------------------------------------*/
 
 BLAST_DATA blast_data_8009F4B8[8] = {
-    { 0x100, 5, 0x3E8, 0x7D0,  2 },
-    { 0x100, 5, 0x3E8, 0x7D0,  6 },
-    { 0x100, 5, 0x3E8, 0x7D0,  5 },
-    { 0x100, 5, 0x3E8, 0x7D0,  4 },
-    { 0x100, 5, 0x3E8, 0x7D0,  3 },
-    { 0x100, 5, 0x3E8, 0x7D0, -1 },
-    { 0x400, 5, 0x3E8, 0x7D0, 10 },
-    {     0, 0,     1,     1, -1 }
+    { 0x100, 5, 0x3E8, 0x7D0, WP_Grenade },
+    { 0x100, 5, 0x3E8, 0x7D0, WP_C4 },
+    { 0x100, 5, 0x3E8, 0x7D0, WP_Claymore },
+    { 0x100, 5, 0x3E8, 0x7D0, WP_Stinger },
+    { 0x100, 5, 0x3E8, 0x7D0, WP_Nikita },
+    { 0x100, 5, 0x3E8, 0x7D0, WP_None },
+    { 0x400, 5, 0x3E8, 0x7D0, WP_Max },
+    {     0, 0,     1,     1, WP_None }
 };
 
 /*---------------------------------------------------------------------------*/
@@ -106,7 +107,7 @@ static void InitBlastTarget(BLAST_DATA *blast_data, Work *work, int side)
 
     GM_Target_8002DCCC(target, 7, 2, blast_data->field_0 >> 1, blast_data->field_4, svector_8009F558);
 
-    target->field_44 = blast_data->field_10;
+    target->weapon = blast_data->weapon;
 
     GM_MoveTarget(&work->target, &work->pos);
     GM_PowerTarget(target);
@@ -125,7 +126,7 @@ static void InitBlastTarget(BLAST_DATA *blast_data, Work *work, int side)
 
     GM_Target_8002DCCC(target, 7, 2, blast_data->field_0 >> 1, 3, svector_8009F558);
 
-    target->field_44 = blast_data->field_10;
+    target->weapon = blast_data->weapon;
 
     GM_MoveTarget(&work->target, &work->pos);
     GM_PowerTarget(target);

source/bullet/blast.h

@@ -14,7 +14,7 @@ typedef struct BLAST_DATA
     int field_4;
     int field_8_z; // size
     int field_C;   // also size?
-    int field_10;  // TARGET->field_44
+    int weapon;
 } BLAST_DATA;
 
 void *NewBlast( MATRIX *world, BLAST_DATA *blast_data );

source/bullet/jirai.c

@@ -329,7 +329,7 @@ static void Act(JiraiWork *work)
             return;
         }
 
-        if ((target2->field_40 & 1) && (GM_PlayerStatus & (PLAYER_INVINCIBLE | PLAYER_GROUND)))
+        if ((target2->push_side & PLAYER_SIDE) && (GM_PlayerStatus & (PLAYER_INVINCIBLE | PLAYER_GROUND)))
         {
             target2->damaged &= ~TARGET_PUSH;
             dword_8009F444 = 0;