Skip to content

Commit a11cb93

Browse files
committed
Adjusting certain code and metadata for Mapbase v6.2
1 parent 763c836 commit a11cb93

4 files changed

Lines changed: 10 additions & 7 deletions

File tree

README

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ interchangeable arms; this may change in the future)
8383
- https://developer.valvesoftware.com/wiki/Npc_clawscanner#Strider_Scout_Issue (npc_clawscanner strider scout fix)
8484
- https://developer.valvesoftware.com/wiki/Ambient_generic:_stop_and_toggle_fix (Fixes for stopping/toggling ambient_generic)
8585
- https://developer.valvesoftware.com/wiki/Func_clip_vphysics ("Start Disabled" keyvalue fix)
86+
- https://developer.valvesoftware.com/wiki/Importing_CSS_Weapons_Into_HL2 (CS:S viewmodel chirality)
8687

8788
//---------------------------------------------------------------------------------------------------------------------------------------------------
8889

@@ -91,16 +92,20 @@ Direct contributions:
9192
- https://github.com/mapbase-source/source-sdk-2013/pull/5 (Custom VScript implementation by ReDucTor; was placed into feature branch before being merged in a subsequent PR)
9293
- https://github.com/mapbase-source/source-sdk-2013/pull/3 ("playvideo" command playback fix from Avantate)
9394
- https://github.com/mapbase-source/source-sdk-2013/pull/21 (Various GCC/Linux fixes from z33ky)
94-
- https://github.com/mapbase-source/source-sdk-2013/pull/47 (VScript utility/consistency changes from samisalreadytaken)
95-
- https://github.com/mapbase-source/source-sdk-2013/pull/59 (New VScript functions and singletons from samisalreadytaken based on API documentation in later Source/Source 2 games)
9695
- https://github.com/mapbase-source/source-sdk-2013/pull/60 (Adjustment by RoyaleNoir to one of Saul's VDC changes)
96+
- https://github.com/mapbase-source/source-sdk-2013/pull/84 (CS:S viewmodel chirality from 1upD)
9797
- Demo autorecord code provided by Klems
9898
- cc_emit crash fix provided by 1upD
9999
- Custom HL2 ammo crate models created by Rara (Textures created by Blixibon; This is asset-based and, aside from the SLAM crate, not reflected in the code)
100100
- Combine lock hardware on door01_left.mdl created by Kralich (This is asset-based and not reflected in the code)
101101
- npc_vehicledriver fixes provided by CrAzY
102102
- npc_combine cover behavior patches provided by iohnnyboy
103103

104+
== Contributions from samisalreadytaken:
105+
=-- https://github.com/mapbase-source/source-sdk-2013/pull/47 (VScript utility/consistency changes)
106+
=-- https://github.com/mapbase-source/source-sdk-2013/pull/59 (New VScript functions and singletons based on API documentation in later Source/Source 2 games)
107+
=-- https://github.com/mapbase-source/source-sdk-2013/pull/80 (More VScript changes, including support for extremely flexible client/server messaging)
108+
104109
//---------------------------------------------------------------------------------------------------------------------------------------------------
105110

106111
Other sources:

sp/src/game/shared/hl2/hl2_usermessages.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,4 @@ void RegisterUserMessages( void )
5555
// NVNT register haptic user messages
5656
RegisterHapticMessages();
5757
#endif
58-
59-
#ifdef MAPBASE_VSCRIPT
60-
usermessages->Register( "ScriptMsg", -1 ); // CNetMsgScriptHelper
61-
#endif
6258
}

sp/src/game/shared/mapbase/mapbase_shared.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ConVar mapbase_load_actbusy("mapbase_load_actbusy", "1", FCVAR_ARCHIVE, "Should
7171

7272
#ifdef GAME_DLL
7373
// This cvar should change with each Mapbase update
74-
ConVar mapbase_version( "mapbase_version", "6.1", FCVAR_NONE, "The version of Mapbase currently being used in this mod." );
74+
ConVar mapbase_version( "mapbase_version", "6.2", FCVAR_NONE, "The version of Mapbase currently being used in this mod." );
7575

7676
extern void MapbaseGameLog_Init();
7777

sp/src/game/shared/mapbase/mapbase_usermessages.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ void HookMapbaseUserMessages( void )
4949
{
5050
// VScript
5151
HOOK_MESSAGE( CallClientScriptFunction );
52+
//HOOK_MESSAGE( ScriptMsg ); // Hooked in CNetMsgScriptHelper
5253
}
5354
#endif
5455

5556
void RegisterMapbaseUserMessages( void )
5657
{
5758
// VScript
5859
usermessages->Register( "CallClientScriptFunction", -1 );
60+
usermessages->Register( "ScriptMsg", -1 ); // CNetMsgScriptHelper
5961

6062
#ifdef CLIENT_DLL
6163
// TODO: Better placement?

0 commit comments

Comments
 (0)