From 4b66769bcbe67e50abd2cf5d8f01e4d0e73cb3f1 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 11 Nov 2012 17:57:09 +0000
Subject: [PATCH] Couple of tweaks in player.c to match all
 ProjectileData[...].xxx with a regexp.

It would be something like "ProjectileData\[([^]]+)]\.([a-z_]+)".

git-svn-id: https://svn.eduke32.com/eduke32@3152 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/player.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 904401b7d..faf500b46 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -601,11 +601,16 @@ int32_t A_Shoot(int32_t i, int32_t atwith)
             {
                 if (hit.wall >= 0 || hit.sprite >= 0)
                 {
+                    int32_t picnum;
+
                     j = A_InsertSprite(hit.sect,hit.pos.x,hit.pos.y,hit.pos.z,atwith,-15,0,0,sa,32,0,i,4);
-                    SpriteProjectile[j].workslike = ProjectileData[sprite[j].picnum].workslike;
+                    picnum = sprite[j].picnum;
+                    SpriteProjectile[j].workslike = ProjectileData[picnum].workslike;
                     sprite[j].extra = ProjectileData[atwith].extra;
+
                     if (ProjectileData[atwith].extra_rand > 0)
                         sprite[j].extra += (krand()&ProjectileData[atwith].extra_rand);
+
                     if (p >= 0)
                     {
                         if (ProjectileData[atwith].spawns >= 0)
@@ -1043,7 +1048,10 @@ DOSKIPBULLETHOLE:
             if (ProjectileData[atwith].clipdist != 255) sprite[j].clipdist = ProjectileData[atwith].clipdist;
             else sprite[j].clipdist = 40;
 
-            Bmemcpy(&SpriteProjectile[j], &ProjectileData[sprite[j].picnum], sizeof(ProjectileData[sprite[j].picnum]));
+            {
+                int32_t picnum = sprite[j].picnum;
+                Bmemcpy(&SpriteProjectile[j], &ProjectileData[picnum], sizeof(projectile_t));
+            }
 
             //            sa = s->ang+32-(krand()&63);
             //            zvel = oldzvel+512-(krand()&1023);