Diff of /grab_plus.sma

-revision 1, Tue Oct 30 09:08:11 2007 UTC
+revision 28, Wed Nov 21 18:04:40 2007 UTC
 Line 1
  /*
- Grab+ v1.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
- Oct 16 21:03
+ Nov 21 11:03
  Description:
  This is a remake from scratch of SpaceDude's Jedi Force Grab plugin.  It has many additional features and optimizations, is less spammy, multilingual and requires fewer binds.
- See it in Action:
- http://www.game-monitor.com/search.php?search=grab_plus_version&type=variable&game=all&location=all
  Features:
  Multilingual
  Screenfade to indicate grab activity instead of chat spam.
-Line 47
+Line 44
  +pull/+push (or invnext/invprev): Pulls/pushes the grabbed towards/away from you as you hold the button.
- +use : Chokes the grabbed (it damages the grabbed with 5 (cvar: gp_chokedmg) hp per 1.5 (cvar: gp_choketime) seconds)
+ +use : Chokes the grabbed (it damages the grabbed with 5 (cvar: gp_choke_dmg) hp per 1.5 (cvar: gp_choke_time) seconds)
- drop - Throws the grabbed with 1500 velocity. (cvar: gp_throwforce)
+ drop - Throws the grabbed with 1500 velocity. (cvar: gp_throw_force)
  Cvars (First value is default):
  gp_enabled <1|0> Enables all plugin functionality.
- gp_playersonly <0|1> Disables admins grabbing entities other than players.
+ gp_players_only <0|1> Disables admins grabbing entities other than players.
  gp_min_dist <90|...> Min distance between the grabber and grabbed.
- gp_grabforce <8|...> Sets the amount of force used when grabbing players.
+ gp_grab_force <8|...> Sets the amount of force used when grabbing players.
- gp_throwforce <1500|...> Sets the power used when throwing players.
+ gp_throw_force <1500|...> Sets the power used when throwing players.
  gp_speed <5|...> How fast the grabbed moves when using push and pull.
- gp_choketime <1.5|...> Time frequency for choking.
+ gp_choke_time <1.5|...> Time frequency for choking.
- gp_chokedmg <5|...> Amount of damage done with each choke.
+ gp_choke_dmg <5|...> Amount of damage done with each choke.
+ gp_auto_choke <1|0> Enable/disable choking automatically with +pull command.
- gp_glow_r <50|0-255> Sets red amount for glow.
- gp_glow_g <0|0-255> Sets green amount for glow.
+ gp_screen_fade <1|0> Enables/disables screenfade when grabbing.
- gp_glow_b <0|0-255> Sets blue amount for glow.
+ gp_glow <1|0> Enables/disables glowing for grabbed objects.
+ gp_glow_r <50|0-255> Sets red amount for glow and screenfade.
+ gp_glow_g <0|0-255> Sets green amount for glow and screenfade.
+ gp_glow_b <0|0-255> Sets blue amount for glow and screenfade.
+ gp_glow_a <0|0-255> Sets alpha for glow and screenfade.
  Notes:
-Line 73
+Line 75
  Credits:
+ Thanks to vittu for contributing code (changed all engine/fun module stuff to fakemeta).
  Thanks to all the coders who worked on the original Jedi Force Grab plugin for all their ideas:
  SpaceDude
  KCE
-Line 98
+Line 102
  Change Log:
  Key (+ added | - removed | c changed | f fixed)
+ v1.2.3 (Nov 21, 2007)
+ c: A few more small optimizations.
+ f: Bloodstream for choke wasn't aligned with player.
+ f: Bad message disconnect error when players were choked. ( stupid SVC_DAMAGE define )
+ v1.2.2 (Nov 16, 2007)
+ c: A few small code optimizations.
+ v1.2.1 (Nov 12, 2007)
+ 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.
+ +: Cvar gp_glow_a controls to control alpha of screenfade and glow.
+ +: Cvar gp_auto_choke to enable/disable choking automatically with +pull command.
+ c: Removed dependency of engine and fun modules.  Thanks to vittu for doing most of the work.
+ c: Made cvar names more consistent by adding more underscores.
+ f: Fixed compile bug with amxx 1.8.0 (Compiles with 1.7.x as well).
  v1.1 (Oct 16, 2007)
  +: Grab a few types of entities other than players.
- +: Cvar gp_playersonly.
+ +: Cvar gp_players_only.
  v1.0 (Oct 13, 2007)
  !: Initial release
-Line 109
+Line 132
  #include <amxmodx>
  #include <amxmisc>
- #include <fun>
- #include <engine>
  #include <fakemeta>
- #define VERSION "1.1"
+ new const VERSION[ ] = "1.2.3"
+ new const TRKCVAR[ ] = "grab_plus_version"
  #define ADMIN ADMIN_LEVEL_A
  #define TSK_CHKE 50
-Line 131
+Line 153
  #define CDF_NO_CHOKE  (1<<2)
  //Cvar Pointers
- new p_enabled, p_playersonly
+ new p_enabled, p_players_only
- new p_throwforce, p_mindist, p_speed, p_grabforce
+ new p_throw_force, p_min_dist, p_speed, p_grab_force
- new p_choketime, p_chokedmg
+ new p_choke_time, p_choke_dmg, p_auto_choke
- new p_glow_r, p_glow_b, p_glow_g
+ new p_glow_r, p_glow_b, p_glow_g, p_glow_a
+ new p_fade, p_glow
  //Pseudo Constants
  new MAXPLAYERS
- new SVC_SCREENFADE, SVC_SCREENSHAKE, SVC_DAMAGE
+ 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_playersonly = register_cvar( "gp_playersonly", "0" )
+         p_players_only = register_cvar( "gp_players_only", "0" )
-         p_mindist = register_cvar ( "gp_min_dist", "90" )
+         p_min_dist = register_cvar ( "gp_min_dist", "90" )
-         p_throwforce = register_cvar( "gp_throwforce", "1500" )
+         p_throw_force = register_cvar( "gp_throw_force", "1500" )
-         p_grabforce = register_cvar( "gp_grabforce", "8" )
+         p_grab_force = register_cvar( "gp_grab_force", "8" )
          p_speed = register_cvar( "gp_speed", "5" )
-         p_choketime = register_cvar( "gp_choketime", "1.5" )
+         p_choke_time = register_cvar( "gp_choke_time", "1.5" )
-         p_chokedmg = register_cvar( "gp_chokedmg", "5" )
+         p_choke_dmg = register_cvar( "gp_choke_dmg", "5" )
+         p_auto_choke = register_cvar( "gp_auto_choke", "1" )
          p_glow_r = register_cvar( "gp_glow_r", "50" )
          p_glow_g = register_cvar( "gp_glow_g", "0" )
          p_glow_b = register_cvar( "gp_glow_b", "0" )
+         p_glow_a = register_cvar( "gp_glow_a", "200" )
+         p_fade = register_cvar( "gp_screen_fade", "1" )
+         p_glow = register_cvar( "gp_glow", "1" )
          register_clcmd( "amx_grab", "force_grab", ADMIN, "Grab client & teleport to you." )
          register_clcmd( "grab_toggle", "grab_toggle", ADMIN, "press once to grab and again to release" )
-Line 178
+Line 205
          register_event( "DeathMsg", "DeathMsg", "a" )
+         register_forward( FM_PlayerPreThink, "fm_player_prethink" )
          register_dictionary( "grab_plus.txt" )
          MAXPLAYERS = get_maxplayers()
          SVC_SCREENFADE = get_user_msgid( "ScreenFade" )
          SVC_SCREENSHAKE = get_user_msgid( "ScreenShake" )
-         SVC_DAMAGE = get_user_msgid( "Damage" )
+         WTF_DAMAGE = get_user_msgid( "Damage" )
-         return PLUGIN_CONTINUE
  }
  public plugin_precache( )
  {
          precache_sound( "player/PL_PAIN2.WAV" )
-         return PLUGIN_CONTINUE
  }
- public client_PreThink( id )
+ public fm_player_prethink( id )
  {
+         new target
          //Search for a target
          if ( client_data[id][GRABBED] == -1 )
          {
                  new Float:orig[3], Float:ret[3]
-                 entity_get_vector( id, EV_VEC_origin, orig )
+                 get_view_pos( id, orig )
-                 entity_get_vector( id, EV_VEC_view_ofs, ret )
+                 ret = vel_by_aim( id, 9999 )
-                 for( new i = 0; i < 3; i++ ) orig[i] += ret[i]
+                 ret[0] += orig[0]
-                 velocity_by_aim( id, 1, ret )
+                 ret[1] += orig[1]
-                 for( new i = 0; i < 3; i++ ) ret[i] = orig[i] + ( ret[i] * 9999 )
+                 ret[2] += orig[2]
-                 new target = trace_line( id, orig, ret, ret )
+                 target = traceline( orig, ret, id, ret )
                  if( 0 < target <= MAXPLAYERS )
                  {
-                         if( is_grabbed( target, id ) ) return PLUGIN_CONTINUE
+                         if( is_grabbed( target, id ) ) return FMRES_IGNORED
                          set_grabbed( id, target )
                  }
-                 else if( !get_pcvar_num( p_playersonly ) )
+                 else if( !get_pcvar_num( p_players_only ) )
                  {
                          new movetype
-                         if( target )
+                         if( target && pev_valid( target ) )
                          {
                                  movetype = pev( target, pev_movetype )
                                  if( !( movetype == MOVETYPE_WALK || movetype == MOVETYPE_STEP || movetype == MOVETYPE_TOSS ) )
-                                         return PLUGIN_CONTINUE
+                                         return FMRES_IGNORED
                          }
                          else
                          {
-                                 new ent = find_ent_in_sphere( -1, ret, 12.0)
+                                 target = 0
+                                 new ent = engfunc( EngFunc_FindEntityInSphere, -1, ret, 12.0 )
                                  while( !target && ent > 0 )
                                  {
                                          movetype = pev( ent, pev_movetype )
                                          if( ( movetype == MOVETYPE_WALK || movetype == MOVETYPE_STEP || movetype == MOVETYPE_TOSS )
                                                          && ent != id  )
                                                  target = ent
-                                         ent = find_ent_in_sphere( ent, ret, 12.0)
+                                         ent = engfunc( EngFunc_FindEntityInSphere, ent, ret, 12.0 )
                                  }
                          }
                          if( target )
                          {
-                                 if( is_grabbed( target, id ) ) return PLUGIN_CONTINUE
+                                 if( is_grabbed( target, id ) ) return FMRES_IGNORED
                                  set_grabbed( id, target )
                          }
                  }
          }
+         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 )
-                         return PLUGIN_CONTINUE
+                         return FMRES_IGNORED
                  }
                  //Use key choke
-Line 258
+Line 287
                          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] )
-         return PLUGIN_CONTINUE
+         //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 278
+Line 311
          if( pev( target, pev_movetype ) == MOVETYPE_FLY && !(pev( target, pev_button ) & IN_JUMP ) ) client_cmd( target, "+jump;wait;-jump" )
          //Move targeted client
-         new Float:tmpvec[3], Float:tmpvec2[3], Float:dest[3], Float:torig[3], Float:tvel[3]
+         new Float:tmpvec[3], Float:tmpvec2[3], Float:torig[3], Float:tvel[3]
-         new len = client_data[id][GRAB_LEN]
+         get_view_pos( id, tmpvec )
+         tmpvec2 = vel_by_aim( id, client_data[id][GRAB_LEN] )
-         entity_get_vector( id, EV_VEC_origin, dest )
-         entity_get_vector( id, EV_VEC_view_ofs, tmpvec )
-         velocity_by_aim( id, len, tmpvec2 )
          torig = get_target_origin_f( target )
-         new force = get_pcvar_num( p_grabforce )
+         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[1] = ( ( tmpvec[1] + tmpvec2[1] ) - torig[1] ) * force
-                 dest[i] += tmpvec[i] + tmpvec2[i]
+         tvel[2] = ( ( tmpvec[2] + tmpvec2[2] ) - torig[2] ) * force
-                 tvel[i] = ( dest[i] - torig[i] ) * force
-         }
-         entity_set_vector( target, EV_VEC_velocity, tvel )
+         set_pev( target, pev_velocity, tvel )
  }
  stock Float:get_target_origin_f( id )
  {
          new Float:orig[3]
-         entity_get_vector( id, EV_VEC_origin, orig )
+         pev( id, pev_origin, orig )
          //If grabbed is not a player, move origin to center
          if( id > MAXPLAYERS )
          {
                  new Float:mins[3], Float:maxs[3]
-                 entity_get_vector( id, EV_VEC_mins, mins )
+                 pev( id, pev_mins, mins )
-                 entity_get_vector( id, EV_VEC_maxs, maxs )
+                 pev( id, pev_maxs, maxs )
                  if( !mins[2] ) orig[2] += maxs[2] / 2
          }
-Line 335
+Line 366
  public screenfade_in( id )
  {
+         if( get_pcvar_num( p_fade ) )
+         {
          message_begin( MSG_ONE, SVC_SCREENFADE, _, id )
          write_short( 10000 ) //duration
          write_short( 0 ) //hold
-Line 342
+Line 375
          write_byte( get_pcvar_num( p_glow_r ) ) //r
          write_byte( get_pcvar_num( p_glow_g ) ) //g
          write_byte( get_pcvar_num( p_glow_b ) ) //b
-         write_byte( 127 ) //a
+                 write_byte( get_pcvar_num( p_glow_a ) / 2 ) //a
          message_end( )
  }
+ }
  public throw( id )
  {
          new target = client_data[id][GRABBED]
          if( target > 0 )
          {
-                 new Float:pVelocity[3]
+                 set_pev( target, pev_velocity, vel_by_aim( id, get_pcvar_num(p_throw_force) ) )
-                 velocity_by_aim( id, get_pcvar_num(p_throwforce), pVelocity )
-                 entity_set_vector( target, EV_VEC_velocity, pVelocity )
                  unset_grabbed( id )
                  return PLUGIN_HANDLED
          }
          return PLUGIN_CONTINUE
  }
-Line 365
+Line 398
          new target = client_data[id][GRABBED]
          if( target > 0 && pev_valid( target ) )
          {
-                 set_rendering( target )
+                 set_pev( target, pev_renderfx, kRenderFxNone )
+                 set_pev( target, pev_rendercolor, {255.0, 255.0, 255.0} )
+                 set_pev( target, pev_rendermode, kRenderNormal )
+                 set_pev( target, pev_renderamt, 16.0 )
                  if( 0 < target <= MAXPLAYERS )
                          client_data[target][GRABBER] = 0
          }
          client_data[id][GRABBED] = 0
+         if( get_pcvar_num( p_fade ) )
+         {
          message_begin( MSG_ONE, SVC_SCREENFADE, _, id )
          write_short( 10000 ) //duration
          write_short( 0 ) //hold
-Line 378
+Line 417
          write_byte( get_pcvar_num( p_glow_r ) ) //r
          write_byte( get_pcvar_num( p_glow_g ) ) //g
          write_byte( get_pcvar_num( p_glow_b ) ) //b
-         write_byte( 127 ) //a
+                 write_byte( get_pcvar_num( p_glow_a ) / 2 ) //a
          message_end( )
  }
+ }
  //Grabs onto someone
  public set_grabbed( id, target )
  {
-         set_rendering( target,
+         if( get_pcvar_num( p_glow ) )
-                 kRenderFxGlowShell,
+         {
-                 get_pcvar_num( p_glow_r ),
+                 new Float:color[3]
-                 get_pcvar_num( p_glow_g ),
+                 color[0] = get_pcvar_float( p_glow_r )
-                 get_pcvar_num( p_glow_b ),
+                 color[1] = get_pcvar_float( p_glow_g )
-                 kRenderTransColor,
+                 color[2] = get_pcvar_float( p_glow_b )
-)
+                 set_pev( target, pev_renderfx, kRenderFxGlowShell )
+                 set_pev( target, pev_rendercolor, color )
+                 set_pev( target, pev_rendermode, kRenderTransColor )
+                 set_pev( target, pev_renderamt, get_pcvar_float( p_glow_a ) )
+         }
          if( 0 < target <= MAXPLAYERS )
                  client_data[target][GRABBER] = id
          client_data[id][FLAGS] = 0
          client_data[id][GRABBED] = target
-         client_data[id][GRAB_LEN] = floatround( entity_range( target, id ) )
+         new Float:torig[3], Float:orig[3]
-         if( client_data[id][GRAB_LEN] < get_pcvar_num( p_mindist ) ) client_data[id][GRAB_LEN] = get_pcvar_num( p_mindist )
+         pev( target, pev_origin, torig )
+         pev( id, pev_origin, orig )
+         client_data[id][GRAB_LEN] = floatround( get_distance_f( torig, orig ) )
+         if( client_data[id][GRAB_LEN] < get_pcvar_num( p_min_dist ) ) client_data[id][GRAB_LEN] = get_pcvar_num( p_min_dist )
  }
  public push( id )
-Line 439
+Line 486
  public do_pull( id )
  {
-         new mindist = get_pcvar_num( p_mindist )
+         new mindist = get_pcvar_num( p_min_dist )
          new len = client_data[id][GRAB_LEN]
          if( len > mindist )
-Line 448
+Line 495
                  if( len < mindist ) len = mindist
                  client_data[id][GRAB_LEN] = len
          }
-         else do_choke( id )
+         else if( get_pcvar_num( p_auto_choke ) )
+                 do_choke( id )
  }
  public do_choke( id )
-Line 456
+Line 504
          new target = client_data[id][GRABBED]
          if( client_data[id][FLAGS] & CDF_NO_CHOKE || id == target || target > MAXPLAYERS) return
-         new dmg = get_pcvar_num( p_chokedmg )
+         new dmg = get_pcvar_num( p_choke_dmg )
-         new Float:vec[3]
+         new vec[3]
-         get_target_origin_f( target )
+         FVecIVec( get_target_origin_f( target ), vec )
          message_begin( MSG_ONE, SVC_SCREENSHAKE, _, target )
          write_short( 999999 ) //amount
-Line 476
+Line 524
          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
-         write_coord( floatround( vec[0] ) ) //origin[x]
+         write_coord( vec[0] ) //origin[x]
-         write_coord( floatround( vec[1] ) ) //origin[y]
+         write_coord( vec[1] ) //origin[y]
-         write_coord( floatround( vec[2] ) ) //origin[z]
+         write_coord( vec[2] ) //origin[z]
          message_end( )
          message_begin( MSG_BROADCAST, SVC_TEMPENTITY )
          write_byte( TE_BLOODSTREAM )
-         write_coord( floatround( vec[0] ) ) //pos.x
+         write_coord( vec[0] ) //pos.x
-         write_coord( floatround( vec[1] ) ) //pos.y
+         write_coord( vec[1] ) //pos.y
-         write_coord( floatround( vec[2] ) + 15 ) //pos.z
+         write_coord( vec[2] + 15 ) //pos.z
          write_coord( random_num( 0, 255 ) ) //vec.x
          write_coord( random_num( 0, 255 ) ) //vec.y
          write_coord( random_num( 0, 255 ) ) //vec.z
-Line 504
+Line 552
          emit_sound( target, CHAN_BODY, "player/PL_PAIN2.WAV", VOL_NORM, ATTN_NORM, 0, PITCH_NORM )
          client_data[id][FLAGS] ^= CDF_NO_CHOKE
-         set_task( get_pcvar_float( p_choketime ), "clear_no_choke", TSK_CHKE + id )
+         set_task( get_pcvar_float( p_choke_time ), "clear_no_choke", TSK_CHKE + id )
  }
  public clear_no_choke( tskid )
-Line 531
+Line 579
          }
          //Safe to tp target to aim spot?
-         new Float:tmpvec[3], Float:tmpvec2[3], Float:orig[3], Float:torig[3], Float:trace_ret[3]
+         new Float:tmpvec[3], Float:orig[3], Float:torig[3], Float:trace_ret[3]
          new bool:safe = false, i
-         entity_get_vector( id, EV_VEC_origin, orig )
+         get_view_pos( id, orig )
-         entity_get_vector( id, EV_VEC_view_ofs, tmpvec )
+         tmpvec = vel_by_aim( id, get_pcvar_num( p_min_dist ) )
-         for( i = 0; i < 3; i++ ) tmpvec[i] += orig[i]
-         velocity_by_aim( id, get_pcvar_num( p_mindist ), tmpvec2 )
          for( new j = 1; j < 11 && !safe; j++ )
          {
-                 for( i = 0; i < 3; i++ )
+                 torig[0] = orig[0] + tmpvec[i] * j
-                         torig[i] = tmpvec[i] + tmpvec2[i] * j
+                 torig[1] = orig[1] + tmpvec[i] * j
+                 torig[2] = orig[2] + tmpvec[i] * j
+                 traceline( tmpvec, torig, id, trace_ret )
-                 trace_line( id, tmpvec, torig, trace_ret )
                  if( get_distance_f( trace_ret, torig ) ) break
-                 if( !trace_hull( torig, HULL_HUMAN ) ) safe = true
+                 engfunc( EngFunc_TraceHull, torig, torig, 0, HULL_HUMAN, 0, 0 )
+                 if ( !get_tr2( 0, TR_StartSolid ) && !get_tr2( 0, TR_AllSolid ) && get_tr2( 0, TR_InOpen ) )
+                         safe = true
          }
          //Still not safe? Then find another safe spot somewhere around the grabber
+         pev( id, pev_origin, orig )
          new try[3]
          orig[2] += 2
          while( try[2] < 3 && !safe )
-Line 562
+Line 614
                                  case 2 : torig[i] = orig[i] - ( i == 2 ? 80 : 40 )
                          }
-                 trace_line( id, tmpvec, torig, trace_ret )
+                 traceline( tmpvec, torig, id, trace_ret )
-                 if( !trace_hull( torig, HULL_HUMAN ) && !get_distance_f( trace_ret, torig ) ) safe = true
+                 engfunc( EngFunc_TraceHull, torig, torig, 0, HULL_HUMAN, 0, 0 )
+                 if ( !get_tr2( 0, TR_StartSolid ) && !get_tr2( 0, TR_AllSolid ) && get_tr2( 0, TR_InOpen )
+                                 && !get_distance_f( trace_ret, torig ) ) safe = true
                  try[0]++
                  if( try[0] == 3 )
-Line 580
+Line 635
          if( safe )
          {
-                 entity_set_vector( targetid, EV_VEC_origin, torig )
+                 set_pev( targetid, pev_origin, torig )
                  set_grabbed( id, targetid )
                  screenfade_in( id )
          }
-Line 618
+Line 673
          else if( client_data[id][GRABBER] )
                  unset_grabbed( client_data[id][GRABBER] )
  }
+ stock traceline( const Float:vStart[3], const Float:vEnd[3], const pIgnore, Float:vHitPos[3] )
+ {
+         engfunc( EngFunc_TraceLine, vStart, vEnd, 0, pIgnore, 0 )
+         get_tr2( 0, TR_vecEndPos, vHitPos )
+         return get_tr2( 0, TR_pHit )
+ }
+ stock get_view_pos( const id, Float:vViewPos[3] )
+ {
+         new Float:vOfs[3]
+         pev( id, pev_origin, vViewPos )
+         pev( id, pev_view_ofs, vOfs )
+         vViewPos[0] += vOfs[0]
+         vViewPos[1] += vOfs[1]
+         vViewPos[2] += vOfs[2]
+ }
+ stock Float:vel_by_aim( id, speed = 1 )
+ {
+         new Float:v1[3], Float:vBlah[3]
+         pev( id, pev_v_angle, v1 )
+         engfunc( EngFunc_AngleVectors, v1, v1, vBlah, vBlah )
+         v1[0] *= speed
+         v1[1] *= speed
+         v1[2] *= speed
+         return v1
+ }

 Legend:



Removed from v.1
 


changed lines


 
Added in v.28
 Legend:



Removed from v.1
 


changed lines


 
Added in v.28
-Removed from v.1
+Added in v.28

Contact	ViewVC Help
Powered by ViewVC 1.0.4