Diff of /grab_plus.sma

-revision 15, Mon Nov 12 21:37:01 2007 UTC
+revision 27, Wed Nov 21 04:12:55 2007 UTC
 Line 1
  /*
- Grab+ v1.2.1
+ Grab+ v1.2.3
  Copyright (C) 2007 Ian (Juan) Cammarata
- This program is free software; you can redistribute it and/or modify it under
+ This program is free software: you can redistribute it and/or modify
- the terms of the GNU General Public License as published by the Free Software
+ it under the terms of the GNU Affero General Public License as
- Foundation; either version 2 of the License, or (at your option) any later
+ published by the Free Software Foundation, either version 3 of the
- version.
+ License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ This program is distributed in the hope that it will be useful,
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
- You should have received a copy of the GNU General Public License along with
+ You should have received a copy of the GNU Affero General Public License
- this program; go to http://www.opensource.org/licenses/gpl-license.php
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  --------------------------------------------------------------------------------
  http://ian.cammarata.us/projects/grab_plus
- Nov 12 14:35
+ Nov 16 08:08
  Description:
-Line 101
+Line 102
  Change Log:
  Key (+ added | - removed | c changed | f fixed)
+ v1.2.3 (Nov ??, 2007)
+ c: A few more small optimizations.
+ f: Fixed bad message disconnect error when players get choked. ( stupid SVC_DAMAGE define )
+ v1.2.2 (Nov 16, 2007)
+ c: A few small code optimizations.
  v1.2.1 (Nov 12, 2007)
- f: Elimited two run time warnings in the player prethink function.
+ f: Eliminated two run time warnings in the player prethink function.
  v1.2 (Nov 06, 2007)
  +: Cvars gp_screen_fade and gp_glow to enable/disable these features.
-Line 125
+Line 133
  #include <amxmisc>
  #include <fakemeta>
- #define VERSION "1.2.1"
+ new const VERSION[ ] = "1.2.3RC"
+ new const TRKCVAR[ ] = "grab_plus_version"
  #define ADMIN ADMIN_LEVEL_A
  #define TSK_CHKE 50
- #define SVC_DAMAGE 19
  #define SF_FADEOUT 0
  new client_data[33][4]
-Line 152
+Line 160
  //Pseudo Constants
  new MAXPLAYERS
- new SVC_SCREENFADE, SVC_SCREENSHAKE
+ new SVC_SCREENFADE, SVC_SCREENSHAKE, WTF_DAMAGE
  public plugin_init( )
  {
          register_plugin( "Grab+", VERSION, "Ian Cammarata" )
-         register_cvar( "grab_plus_version", VERSION, FCVAR_SERVER )
+         register_cvar( TRKCVAR, VERSION, FCVAR_SERVER )
-         set_cvar_string( "grab_plus_version", VERSION )
+         set_cvar_string( TRKCVAR, VERSION )
          p_enabled = register_cvar( "gp_enabled", "1" )
          p_players_only = register_cvar( "gp_players_only", "0" )
-Line 204
+Line 212
          SVC_SCREENFADE = get_user_msgid( "ScreenFade" )
          SVC_SCREENSHAKE = get_user_msgid( "ScreenShake" )
+         WTF_DAMAGE = get_user_msgid( "Damage" )
  }
  public plugin_precache( )
-Line 213
+Line 222
  public fm_player_prethink( id )
  {
+         new target
          //Search for a target
          if ( client_data[id][GRABBED] == -1 )
          {
-Line 220
+Line 230
                  get_view_pos( id, orig )
                  ret = vel_by_aim( id, 9999 )
-                 for( new i = 0; i < 3; i++ ) ret[i] = orig[i] + ret[i]
+                 ret[0] += orig[0]
-                 new target = traceline( orig, ret, id, ret )
+                 ret[1] += orig[1]
+                 ret[2] += orig[2]
+                 target = traceline( orig, ret, id, ret )
                  if( 0 < target <= MAXPLAYERS )
                  {
-Line 257
+Line 270
                          }
                  }
          }
+         target = client_data[id][GRABBED]
          //If they've grabbed something
-         if( client_data[id][GRABBED] > 0 )
+         if( target > 0 )
          {
-                 new target = client_data[id][GRABBED]
                  if( !pev_valid( target ) || ( pev( target, pev_health ) < 1 && pev( target, pev_max_health ) ) )
                  {
                          unset_grabbed( id )
-Line 272
+Line 286
                          do_choke( id )
                  //Push and pull
-                 if ( client_data[id][FLAGS] & CDF_IN_PULL )
+                 new cdf = client_data[id][FLAGS]
+                 if ( cdf & CDF_IN_PULL )
                          do_pull( id )
-                 else if ( client_data[id][FLAGS] & CDF_IN_PUSH )
+                 else if ( cdf & CDF_IN_PUSH )
                          do_push( id )
-                 grab_think( id )
+                 if( target > MAXPLAYERS ) grab_think( id )
          }
-         if( client_data[id][GRABBER] > 0 ) grab_think( client_data[id][GRABBER] )
+         //If they're grabbed
+         target = client_data[id][GRABBER]
+         if( target > 0 ) grab_think( target )
          return FMRES_IGNORED
  }
- public grab_think ( id )
+ public grab_think( id ) //id of the grabber
  {
          new target = client_data[id][GRABBED]
-Line 302
+Line 320
          new force = get_pcvar_num( p_grab_force )
-         for( new i = 0; i < 3; i++ )
+         tvel[0] = ( ( tmpvec[0] + tmpvec2[0] ) - torig[0] ) * force
-                 tvel[i] = ( ( tmpvec[i] + tmpvec2[i] ) - torig[i] ) * force
+         tvel[1] = ( ( tmpvec[1] + tmpvec2[1] ) - torig[1] ) * force
+         tvel[2] = ( ( tmpvec[2] + tmpvec2[2] ) - torig[2] ) * force
          set_pev( target, pev_velocity, tvel )
  }
-Line 482
+Line 501
  public do_choke( id )
  {
          new target = client_data[id][GRABBED]
-         if( client_data[id][FLAGS] & CDF_NO_CHOKE || id == target || target > MAXPLAYERS) return
+         if( client_data[id][FLAGS] & CDF_NO_CHOKE /*|| id == target*/ || target > MAXPLAYERS) return
          new dmg = get_pcvar_num( p_choke_dmg )
          new Float:vec[3]
-Line 504
+Line 523
          write_byte( 200 ) //a
          message_end( )
-         message_begin( MSG_ONE, SVC_DAMAGE, _, target )
+         message_begin( MSG_ONE, WTF_DAMAGE, _, target )
          write_byte( 0 ) //damage armor
          write_byte( dmg ) //damage health
          write_long( DMG_CRUSH ) //damage type
-Line 567
+Line 586
          for( new j = 1; j < 11 && !safe; j++ )
          {
-                 for( i = 0; i < 3; i++ ) torig[i] = orig[i] + tmpvec[i] * j
+                 torig[0] = orig[0] + tmpvec[i] * j
+                 torig[1] = orig[1] + tmpvec[i] * j
+                 torig[2] = orig[2] + tmpvec[i] * j
                  traceline( tmpvec, torig, id, trace_ret )
                  if( get_distance_f( trace_ret, torig ) ) break
-Line 660
+Line 682
  stock get_view_pos( const id, Float:vViewPos[3] )
  {
-         new Float:ofs[3]
+         new Float:vOfs[3]
          pev( id, pev_origin, vViewPos )
-         pev( id, pev_view_ofs, ofs )
+         pev( id, pev_view_ofs, vOfs )
-         for( new i = 0; i < 3; i++ ) vViewPos[i] += ofs[i]
+         vViewPos[0] += vOfs[0]
+         vViewPos[1] += vOfs[1]
+         vViewPos[2] += vOfs[2]
  }
  stock Float:vel_by_aim( id, speed = 1 )
-Line 671
+Line 696
          new Float:v1[3], Float:vBlah[3]
          pev( id, pev_v_angle, v1 )
          engfunc( EngFunc_AngleVectors, v1, v1, vBlah, vBlah )
-         for( new i = 0; i < 3; i++ ) v1[i] *= speed
+         v1[0] *= speed
+         v1[1] *= speed
+         v1[2] *= speed
          return v1
  }

 Legend:



Removed from v.15
 


changed lines


 
Added in v.27
 Legend:



Removed from v.15
 


changed lines


 
Added in v.27
-Removed from v.15
+Added in v.27

Contact	ViewVC Help
Powered by ViewVC 1.0.4