shotgun: damage bug fix, constants moved

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7016 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/src/entity.h

@@ -49,6 +49,23 @@ enum { GUN_KNIFE = 0, GUN_PISTOL, GUN_CARBINE, GUN_SHOTGUN, GUN_SUBGUN, GUN_SNIP
 #define reloadable_gun(g) (g != GUN_KNIFE && g != GUN_GRENADE)
 
 #define SGRAYS 21
+#define SGDMGTOTAL 90
+
+#define SGDMGBONUS 65
+#define SGDMGDISTB 50
+
+#define SGCCdmg 500
+#define SGCCbase 0
+#define SGCCrange 40
+
+#define SGCMdmg 375
+#define SGCMbase 25
+#define SGCMrange 60
+
+#define SGCOdmg 125
+#define SGCObase 45
+#define SGCOrange 75
+
 #define SGMAXDMGABS 105
 #define SGMAXDMGLOC 84
 #define SGBONUSDIST 80

source/src/weapon.cpp

@@ -8,29 +8,9 @@ VARP(autoreload, 0, 1, 1);
 VARP(akimboautoswitch, 0, 1, 1);
 VARP(akimboendaction, 0, 1, 2); // 0: stay with pistol, 1: back to primary, 2: grenade - all fallback to previous one w/o ammo for target
 
-int SGDMGTOTAL = 90;
-
-int SGDMGBONUS = 65;
-int SGDMGDISTB = 50;
-
-int SGCCdmg = 500;
-int SGCCbase = 0;
-int SGCCrange = 40;
-
-int SGCMdmg = 375;
-int SGCMbase = 25;
-int SGCMrange = 60;
-
-int SGCOdmg = 125;
-int SGCObase = 45;
-int SGCOrange = 75;
-
-
 sgray sgr[SGRAYS*3];
 sgray pat[SGRAYS*3]; // DEBUG 2011may27
 
-
-
 int burstshotssettings[NUMGUNS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
 
 void updatelastaction(playerent *d, int millis = lastmillis)
@@ -677,7 +657,7 @@ void raydamage(vec &from, vec &to, playerent *d)
                  dmgreal = min(dmgreal, SGMAXDMGABS);
                  }
                  */
-                dmgreal = (int) dmg4r;
+                dmgreal = (int) ceil(dmg4r);
                 lastsgs_hits = numhits;
                 lastsgs_dmgt = dmgreal;
 //                conoutf("%d [%.3f%s] DMG with %d hits", lastsgs_dmgt, dmg4r, withBONUS ? "\fs\f3+\fr" : "", lastsgs_hits);