From 1ae42463e31858468cf9aa9037c750e89c95d7ab Mon Sep 17 00:00:00 2001 From: Evgenii Babinets Date: Sun, 13 Oct 2013 01:45:27 -0400 Subject: [PATCH 1/2] Added missing class prefix to function pointers. --- dlls/effects.cpp | 2 +- dmc/dlls/effects.cpp | 2 +- ricochet/dlls/effects.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/effects.cpp b/dlls/effects.cpp index cebe5d9..44e3f3b 100644 --- a/dlls/effects.cpp +++ b/dlls/effects.cpp @@ -427,7 +427,7 @@ LINK_ENTITY_TO_CLASS( trip_beam, CTripBeam ); void CTripBeam::Spawn( void ) { CLightning::Spawn(); - SetTouch( TriggerTouch ); + SetTouch( &CBeam::TriggerTouch ); pev->solid = SOLID_TRIGGER; RelinkBeam(); } diff --git a/dmc/dlls/effects.cpp b/dmc/dlls/effects.cpp index 76fbc65..e299724 100644 --- a/dmc/dlls/effects.cpp +++ b/dmc/dlls/effects.cpp @@ -427,7 +427,7 @@ LINK_ENTITY_TO_CLASS( trip_beam, CTripBeam ); void CTripBeam::Spawn( void ) { CLightning::Spawn(); - SetTouch( TriggerTouch ); + SetTouch( &CBeam::TriggerTouch ); pev->solid = SOLID_TRIGGER; RelinkBeam(); } diff --git a/ricochet/dlls/effects.cpp b/ricochet/dlls/effects.cpp index e232e57..b906e60 100644 --- a/ricochet/dlls/effects.cpp +++ b/ricochet/dlls/effects.cpp @@ -427,7 +427,7 @@ LINK_ENTITY_TO_CLASS( trip_beam, CTripBeam ); void CTripBeam::Spawn( void ) { CLightning::Spawn(); - SetTouch( TriggerTouch ); + SetTouch( &CBeam::TriggerTouch ); pev->solid = SOLID_TRIGGER; RelinkBeam(); } From 8fc24de0950b30e6fb6271d5f9999f77f7b254bd Mon Sep 17 00:00:00 2001 From: Evgenii Babinets Date: Sun, 13 Oct 2013 20:34:25 -0400 Subject: [PATCH 2/2] Changed to CTripBeam to allow future overloading. --- dlls/effects.cpp | 2 +- dmc/dlls/effects.cpp | 2 +- ricochet/dlls/effects.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/effects.cpp b/dlls/effects.cpp index 44e3f3b..602f094 100644 --- a/dlls/effects.cpp +++ b/dlls/effects.cpp @@ -427,7 +427,7 @@ LINK_ENTITY_TO_CLASS( trip_beam, CTripBeam ); void CTripBeam::Spawn( void ) { CLightning::Spawn(); - SetTouch( &CBeam::TriggerTouch ); + SetTouch( &CTripBeam::TriggerTouch ); pev->solid = SOLID_TRIGGER; RelinkBeam(); } diff --git a/dmc/dlls/effects.cpp b/dmc/dlls/effects.cpp index e299724..7c02b40 100644 --- a/dmc/dlls/effects.cpp +++ b/dmc/dlls/effects.cpp @@ -427,7 +427,7 @@ LINK_ENTITY_TO_CLASS( trip_beam, CTripBeam ); void CTripBeam::Spawn( void ) { CLightning::Spawn(); - SetTouch( &CBeam::TriggerTouch ); + SetTouch( &CTripBeam::TriggerTouch ); pev->solid = SOLID_TRIGGER; RelinkBeam(); } diff --git a/ricochet/dlls/effects.cpp b/ricochet/dlls/effects.cpp index b906e60..825dac2 100644 --- a/ricochet/dlls/effects.cpp +++ b/ricochet/dlls/effects.cpp @@ -427,7 +427,7 @@ LINK_ENTITY_TO_CLASS( trip_beam, CTripBeam ); void CTripBeam::Spawn( void ) { CLightning::Spawn(); - SetTouch( &CBeam::TriggerTouch ); + SetTouch( &CTripBeam::TriggerTouch ); pev->solid = SOLID_TRIGGER; RelinkBeam(); }