From 2a7a36ef96aad2cdae46f2a630167f00473ab100 Mon Sep 17 00:00:00 2001 From: meatspace Date: Thu, 26 Jun 2025 13:05:06 -0800 Subject: [PATCH 1/3] fix func_conveyor code fix found on momentum mod repo --- sp/src/game/server/bmodels.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sp/src/game/server/bmodels.cpp b/sp/src/game/server/bmodels.cpp index e8291f8f604..047e0db661b 100644 --- a/sp/src/game/server/bmodels.cpp +++ b/sp/src/game/server/bmodels.cpp @@ -254,6 +254,7 @@ void CFuncVehicleClip::InputDisable( inputdata_t &data ) #define SF_CONVEYOR_VISUAL 0x0001 #define SF_CONVEYOR_NOTSOLID 0x0002 +#define SF_CONVEYOR_START_DISABLED 0x0003 class CFuncConveyor : public CFuncWall { @@ -285,7 +286,7 @@ LINK_ENTITY_TO_CLASS( func_conveyor, CFuncConveyor ); BEGIN_DATADESC( CFuncConveyor ) DEFINE_INPUTFUNC( FIELD_VOID, "ToggleDirection", InputToggleDirection ), - DEFINE_INPUTFUNC( FIELD_VOID, "SetSpeed", InputSetSpeed ), + DEFINE_INPUTFUNC(FIELD_FLOAT, "SetSpeed", InputSetSpeed), DEFINE_KEYFIELD( m_vecMoveDir, FIELD_VECTOR, "movedir" ), DEFINE_FIELD( m_flConveyorSpeed, FIELD_FLOAT ), @@ -320,8 +321,13 @@ void CFuncConveyor::Spawn( void ) AddSolidFlags( FSOLID_NOT_SOLID ); } - if ( m_flSpeed == 0 ) - m_flSpeed = 100; + if (!HasSpawnFlags(SF_CONVEYOR_VISUAL)) + { + if (m_flSpeed == 0) + { + m_flSpeed = 100; + } + } UpdateSpeed( m_flSpeed ); } From f226f8d2b095c2b2cabac95dfbcbb98d0134f0e7 Mon Sep 17 00:00:00 2001 From: meatspace Date: Fri, 11 Jul 2025 16:35:41 -0800 Subject: [PATCH 2/3] whitespace fix --- sp/src/game/server/bmodels.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sp/src/game/server/bmodels.cpp b/sp/src/game/server/bmodels.cpp index 047e0db661b..f07282b1496 100644 --- a/sp/src/game/server/bmodels.cpp +++ b/sp/src/game/server/bmodels.cpp @@ -286,7 +286,7 @@ LINK_ENTITY_TO_CLASS( func_conveyor, CFuncConveyor ); BEGIN_DATADESC( CFuncConveyor ) DEFINE_INPUTFUNC( FIELD_VOID, "ToggleDirection", InputToggleDirection ), - DEFINE_INPUTFUNC(FIELD_FLOAT, "SetSpeed", InputSetSpeed), + DEFINE_INPUTFUNC( FIELD_FLOAT, "SetSpeed", InputSetSpeed ), DEFINE_KEYFIELD( m_vecMoveDir, FIELD_VECTOR, "movedir" ), DEFINE_FIELD( m_flConveyorSpeed, FIELD_FLOAT ), From ecc3ef4f12da68a7d0b62f858ab5d87a4eb8a65d Mon Sep 17 00:00:00 2001 From: meatspace Date: Sat, 12 Jul 2025 20:33:28 -0800 Subject: [PATCH 3/3] ifdefs --- sp/src/game/server/bmodels.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sp/src/game/server/bmodels.cpp b/sp/src/game/server/bmodels.cpp index f07282b1496..dee05d0cda5 100644 --- a/sp/src/game/server/bmodels.cpp +++ b/sp/src/game/server/bmodels.cpp @@ -254,7 +254,9 @@ void CFuncVehicleClip::InputDisable( inputdata_t &data ) #define SF_CONVEYOR_VISUAL 0x0001 #define SF_CONVEYOR_NOTSOLID 0x0002 +#ifdef MAPBASE #define SF_CONVEYOR_START_DISABLED 0x0003 +#endif // MAPBASE class CFuncConveyor : public CFuncWall { @@ -321,7 +323,9 @@ void CFuncConveyor::Spawn( void ) AddSolidFlags( FSOLID_NOT_SOLID ); } + #ifdef MAPBASE if (!HasSpawnFlags(SF_CONVEYOR_VISUAL)) + #endif // MAPBASE { if (m_flSpeed == 0) {