[Half-Life AMXX] / grab_plus.sma Repository:
ViewVC logotype

Diff of /grab_plus.sma

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 25, Tue Nov 20 22:36:56 2007 UTC revision 27, Wed Nov 21 04:12:55 2007 UTC
# Line 1  Line 1 
1  /*  /*
2  Grab+ v1.2.2  Grab+ v1.2.3
3  Copyright (C) 2007 Ian (Juan) Cammarata  Copyright (C) 2007 Ian (Juan) Cammarata
4    
5  This program is free software: you can redistribute it and/or modify  This program is free software: you can redistribute it and/or modify
# Line 102  Line 102 
102  Change Log:  Change Log:
103  Key (+ added | - removed | c changed | f fixed)  Key (+ added | - removed | c changed | f fixed)
104    
105    v1.2.3 (Nov ??, 2007)
106    c: A few more small optimizations.
107    f: Fixed bad message disconnect error when players get choked. ( stupid SVC_DAMAGE define )
108    
109  v1.2.2 (Nov 16, 2007)  v1.2.2 (Nov 16, 2007)
110  c: A few small code optimizations.  c: A few small code optimizations.
111    
# Line 129  Line 133 
133  #include <amxmisc>  #include <amxmisc>
134  #include <fakemeta>  #include <fakemeta>
135    
136  #define VERSION "1.2.2"  new const VERSION[ ] = "1.2.3RC"
137    new const TRKCVAR[ ] = "grab_plus_version"
138  #define ADMIN ADMIN_LEVEL_A  #define ADMIN ADMIN_LEVEL_A
139    
140  #define TSK_CHKE 50  #define TSK_CHKE 50
141    
 #define SVC_DAMAGE 19  
142  #define SF_FADEOUT 0  #define SF_FADEOUT 0
143    
144  new client_data[33][4]  new client_data[33][4]
# Line 156  Line 160 
160    
161  //Pseudo Constants  //Pseudo Constants
162  new MAXPLAYERS  new MAXPLAYERS
163  new SVC_SCREENFADE, SVC_SCREENSHAKE  new SVC_SCREENFADE, SVC_SCREENSHAKE, WTF_DAMAGE
164    
165  public plugin_init( )  public plugin_init( )
166  {  {
167          register_plugin( "Grab+", VERSION, "Ian Cammarata" )          register_plugin( "Grab+", VERSION, "Ian Cammarata" )
168          register_cvar( "grab_plus_version", VERSION, FCVAR_SERVER )          register_cvar( TRKCVAR, VERSION, FCVAR_SERVER )
169          set_cvar_string( "grab_plus_version", VERSION )          set_cvar_string( TRKCVAR, VERSION )
170    
171          p_enabled = register_cvar( "gp_enabled", "1" )          p_enabled = register_cvar( "gp_enabled", "1" )
172          p_players_only = register_cvar( "gp_players_only", "0" )          p_players_only = register_cvar( "gp_players_only", "0" )
# Line 208  Line 212 
212    
213          SVC_SCREENFADE = get_user_msgid( "ScreenFade" )          SVC_SCREENFADE = get_user_msgid( "ScreenFade" )
214          SVC_SCREENSHAKE = get_user_msgid( "ScreenShake" )          SVC_SCREENSHAKE = get_user_msgid( "ScreenShake" )
215            WTF_DAMAGE = get_user_msgid( "Damage" )
216  }  }
217    
218  public plugin_precache( )  public plugin_precache( )
# Line 217  Line 222 
222    
223  public fm_player_prethink( id )  public fm_player_prethink( id )
224  {  {
225            new target
226          //Search for a target          //Search for a target
227          if ( client_data[id][GRABBED] == -1 )          if ( client_data[id][GRABBED] == -1 )
228          {          {
# Line 228  Line 234 
234                  ret[1] += orig[1]                  ret[1] += orig[1]
235                  ret[2] += orig[2]                  ret[2] += orig[2]
236    
237                  new target = traceline( orig, ret, id, ret )                  target = traceline( orig, ret, id, ret )
238    
239                  if( 0 < target <= MAXPLAYERS )                  if( 0 < target <= MAXPLAYERS )
240                  {                  {
# Line 264  Line 270 
270                          }                          }
271                  }                  }
272          }          }
273    
274            target = client_data[id][GRABBED]
275          //If they've grabbed something          //If they've grabbed something
276          if( client_data[id][GRABBED] > 0 )          if( target > 0 )
277          {          {
                 new target = client_data[id][GRABBED]  
278                  if( !pev_valid( target ) || ( pev( target, pev_health ) < 1 && pev( target, pev_max_health ) ) )                  if( !pev_valid( target ) || ( pev( target, pev_health ) < 1 && pev( target, pev_max_health ) ) )
279                  {                  {
280                          unset_grabbed( id )                          unset_grabbed( id )
# Line 279  Line 286 
286                          do_choke( id )                          do_choke( id )
287    
288                  //Push and pull                  //Push and pull
289                  if ( client_data[id][FLAGS] & CDF_IN_PULL )                  new cdf = client_data[id][FLAGS]
290                    if ( cdf & CDF_IN_PULL )
291                          do_pull( id )                          do_pull( id )
292                  else if ( client_data[id][FLAGS] & CDF_IN_PUSH )                  else if ( cdf & CDF_IN_PUSH )
293                          do_push( id )                          do_push( id )
294    
295                  grab_think( id )                  if( target > MAXPLAYERS ) grab_think( id )
296          }          }
297          if( client_data[id][GRABBER] > 0 ) grab_think( client_data[id][GRABBER] )  
298            //If they're grabbed
299            target = client_data[id][GRABBER]
300            if( target > 0 ) grab_think( target )
301    
302          return FMRES_IGNORED          return FMRES_IGNORED
303  }  }
304    
305  public grab_think ( id )  public grab_think( id ) //id of the grabber
306  {  {
307          new target = client_data[id][GRABBED]          new target = client_data[id][GRABBED]
308    
# Line 490  Line 501 
501  public do_choke( id )  public do_choke( id )
502  {  {
503          new target = client_data[id][GRABBED]          new target = client_data[id][GRABBED]
504          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
505    
506          new dmg = get_pcvar_num( p_choke_dmg )          new dmg = get_pcvar_num( p_choke_dmg )
507          new Float:vec[3]          new Float:vec[3]
# Line 512  Line 523 
523          write_byte( 200 ) //a          write_byte( 200 ) //a
524          message_end( )          message_end( )
525    
526          message_begin( MSG_ONE, SVC_DAMAGE, _, target )          message_begin( MSG_ONE, WTF_DAMAGE, _, target )
527          write_byte( 0 ) //damage armor          write_byte( 0 ) //damage armor
528          write_byte( dmg ) //damage health          write_byte( dmg ) //damage health
529          write_long( DMG_CRUSH ) //damage type          write_long( DMG_CRUSH ) //damage type
# Line 671  Line 682 
682    
683  stock get_view_pos( const id, Float:vViewPos[3] )  stock get_view_pos( const id, Float:vViewPos[3] )
684  {  {
685          new Float:ofs[3]          new Float:vOfs[3]
686          pev( id, pev_origin, vViewPos )          pev( id, pev_origin, vViewPos )
687          pev( id, pev_view_ofs, ofs )          pev( id, pev_view_ofs, vOfs )
688    
689          vViewPos[0] += ofs[0]          vViewPos[0] += vOfs[0]
690          vViewPos[1] += ofs[1]          vViewPos[1] += vOfs[1]
691          vViewPos[2] += ofs[2]          vViewPos[2] += vOfs[2]
692  }  }
693    
694  stock Float:vel_by_aim( id, speed = 1 )  stock Float:vel_by_aim( id, speed = 1 )
Legend:
Removed from v.25  
changed lines
  Added in v.27
Contact
 ViewVC Help
Powered by ViewVC 1.0.4