Sp backport

.clang-format

@@ -1,36 +1,160 @@
 ---
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Left
+AlignConsecutiveMacros: true
+AlignEscapedNewlines: Left
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+ - CONSTRUCT_EARLY
+ - DLL_CLASS_EXPORT
+ - DLL_CLASS_IMPORT
+ - DLL_EXPORT
+ - DLL_GLOBAL_EXPORT
+ - DLL_GLOBAL_IMPORT
+ - DLL_IMPORT
+ - EXPLICIT
+ - FASTCALL
+ - FMTFUNCTION
+ - FORCEINLINE
+ - FORCEINLINE_TEMPLATE
+ - MULTIPLE_INHERITANCE
+ - NOINLINE
+ - NO_VTABLE
+ - NULLTERMINATED
+ - PLATFORM_INTERFACE
+ - RESTRICT
+ - RESTRICT_FUNC
+ - SELECTANY
+ - SELECTOR
+ - SINGLE_INHERITANCE
+ - STDCALL
+ - TEMPLATE_SPEC_STATIC
+ - TEMPLATE_STATIC
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+BreakBeforeConceptDeclarations: Always
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterComma
+ColumnLimit: 0
+CompactNamespaces: false
+ContinuationIndentWidth: 4
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: true
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat: false
+EmptyLineBeforeAccessModifier: LogicalBlock
+FixNamespaceComments: false
+ForEachMacros:
+ - FOR_EACH_CURRENCY
+ - FOR_EACH_DICT
+ - FOR_EACH_DICT_FAST
+ - FOR_EACH_ENTLIST
+ - FOR_EACH_ENTLIST_HEAD
+ - FOR_EACH_HASHMAP
+ - FOR_EACH_HASHMAP_LRU
+ - FOR_EACH_HASHTABLE
+ - FOR_EACH_LL
+ - FOR_EACH_LL_BACK
+ - FOR_EACH_MAP
+ - FOR_EACH_MAP_BACK
+ - FOR_EACH_MAP_FAST
+ - FOR_EACH_OBJ
+ - FOR_EACH_PTR_ARRAY
+ - FOR_EACH_RBTREE_FAST
+ - FOR_EACH_SUBKEY
+ - FOR_EACH_TRUE_SUBKEY
+ - FOR_EACH_UTLRBTREE
+ - FOR_EACH_VALID_SPLITSCREEN_PLAYER
+ - FOR_EACH_VALUE
+ - FOR_EACH_VEC
+ - FOR_EACH_VEC_BACK
+IncludeBlocks: Regroup
+IncludeCategories:
+ - Regex: "cbase.h"
+   Priority: -1
+ - Regex: "stdafx_client.h"
+   Priority: -1
+ - Regex: "stdafx.h"
+   Priority: -1
+ - Regex: "pch_tier0.h"
+   Priority: -1
+ - Regex: "tier0/memdbgon.h"
+   Priority: 10000
+ - Regex: ".*"
+   Priority: 1
+IndentCaseBlocks: true
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentRequiresClause: true
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
 Language: Cpp
-BasedOnStyle: Microsoft
-Standard: Cpp11
-
-AlignOperands: false
-
-IndentCaseLabels: 'true'
-IndentPPDirectives: BeforeHash
-IndentWidth: '4'
-
-FixNamespaceComments: 'true'
+MacroBlockBegin: "^BEGIN_.*|IMPLEMENT_NETWORKCLASS.*$|^IMPLEMENT_CLIENTCLASS.*$|^IMPLEMENT_SERVERCLASS.*$|^CLIENTEFFECT_REGISTER_BEGIN.*$"
+MacroBlockEnd: "^END_.*$|^CLIENTEFFECT_REGISTER_END.*$"
+MaxEmptyLinesToKeep: 1
 NamespaceIndentation: All
-
-PointerAlignment: Right
-
-SortIncludes: 'false'
-
-TabWidth: '4'
+PackConstructorInitializers: BinPack
+PenaltyReturnTypeOnItsOwnLine: 1000000
+PointerAlignment: Right # todo: change to Left
+PPIndentWidth: 1
+ReferenceAlignment: Right # todo: change to Left
+ReflowComments: true
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Always
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInConditionalStatement: true
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: true
+SpacesInSquareBrackets: false
+Standard: c++20
+StatementMacros:
+ - DECLARE_CLIENTCLASS
+ - DECLARE_CLIENTCLASS_NOBASE
+ - DECLARE_SERVERCLASS
+ - DECLARE_SERVERCLASS_NOBASE
+ - IMPLEMENT_CLIENTCLASS
+ - IMPLEMENT_SERVERCLASS
+ - NOTE_UNUSED
+TabWidth: 4
 UseTab: Always
+UseCRLF: false
+WhitespaceSensitiveMacros:
+ - MKSTRING
 
-AccessModifierOffset: -4
-
-SpacesInAngles: 'false'
-SpacesInCStyleCastParentheses: 'false'
-SpacesInConditionalStatement: 'true'
-SpacesInContainerLiterals: 'false'
-SpacesInParentheses: 'true'
-SpacesInSquareBrackets: 'false'
-
-ReflowComments: 'false'
-
-PenaltyExcessCharacter: 0
 ---
 Language: Proto
 DisableFormat: true

.editorconfig

@@ -0,0 +1,8 @@
+
+root = true
+
+[*]
+insert_final_newline = false
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = false

build.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+pushd "$(dirname "${BASH_SOURCE-$0}")" > /dev/null || exit
+source devtools/linux/env.sh
+
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+export CLICOLOR_FORCE=1
+export TERM=xterm-256color
+
+alias gcc="gcc -fdiagnostics-color=auto"
+
+PROJECT=games
+
+CXXFLAGS="-w -fdiagnostics-color=always" make -f$PROJECT.mak
+
+popd || exit

common/language.cpp

@@ -56,7 +56,6 @@ static const Language_t s_LanguageNames[] =
 	{	"Brazilian",			"brazilian",	"#GameUI_Language_Brazilian",			"pt_BR",	k_Lang_Brazilian,	1046 } ,
 	{	"Bulgarian",			"bulgarian",	"#GameUI_Language_Bulgarian",			"bg_BG",	k_Lang_Bulgarian,	1026 } ,
 	{	"Greek",				"greek",		"#GameUI_Language_Greek",				"el_GR",	k_Lang_Greek,		1032 },
-	{	"Ukrainian",			"ukrainian",	"#GameUI_Language_Ukrainian",			"uk_UA",	k_Lang_Ukrainian,	1058 },
 };	
 
 //-----------------------------------------------------------------------------

common/language.h

@@ -40,7 +40,6 @@ enum ELanguage
 	k_Lang_Brazilian,
 	k_Lang_Bulgarian,
 	k_Lang_Greek,
-	k_Lang_Ukrainian,
 	k_Lang_MAX
 };
 

common/studiobyteswap.cpp

@@ -891,8 +891,8 @@ void ByteswapAnimData( mstudioanimdesc_t *pAnimDesc, int section, byte *&pDataSr
 					int iStartFrame = section * sectionFrames;
 					int iEndFrame = (section + 1) * sectionFrames;
 
-					iStartFrame = min( iStartFrame, totalFrames - 1 );
-					iEndFrame = min( iEndFrame, totalFrames - 1 );
+					iStartFrame = MIN( iStartFrame, totalFrames - 1 );
+					iEndFrame = MIN( iEndFrame, totalFrames - 1 );
 
 					totalFrames = iEndFrame - iStartFrame + 1;
 				}
@@ -1679,11 +1679,6 @@ int ByteswapMDLFile( void *pDestBase, void *pSrcBase, const int fileSize )
 
 		SET_INDEX_POINTERS( pData, pSequence, keyvalueindex )
 		WriteBuffer<char>( pDataDest, pDataSrc, SrcNative( &pSequence->keyvaluesize ) );
-
-		/** ACTIVITY MODIFIERS **/
-
-		SET_INDEX_POINTERS( pData, pSequence, activitymodifierindex )
-		WriteObjects<mstudioactivitymodifier_t>( pDataDest, pDataSrc, SrcNative( &pSequence->numactivitymodifiers ) );
 	}
 
 	/** TRANSITION GRAPH **/
@@ -2806,10 +2801,6 @@ BEGIN_BYTESWAP_DATADESC( mstudiomovement_t )
 	DEFINE_FIELD( position, FIELD_VECTOR ),
 END_BYTESWAP_DATADESC()
 
-BEGIN_BYTESWAP_DATADESC( mstudioactivitymodifier_t )
-	DEFINE_INDEX( sznameindex, FIELD_INTEGER ),
-END_BYTESWAP_DATADESC()
-
 BEGIN_BYTESWAP_DATADESC( mstudioseqdesc_t )
 	DEFINE_INDEX( baseptr, FIELD_INTEGER ),
 	DEFINE_INDEX( szlabelindex, FIELD_INTEGER ),
@@ -2849,9 +2840,7 @@ BEGIN_BYTESWAP_DATADESC( mstudioseqdesc_t )
 	DEFINE_INDEX( keyvalueindex, FIELD_INTEGER ),
 	DEFINE_FIELD( keyvaluesize, FIELD_INTEGER ),
 	DEFINE_INDEX( cycleposeindex, FIELD_INTEGER ),
-	DEFINE_INDEX( activitymodifierindex, FIELD_INTEGER ),
-	DEFINE_FIELD( numactivitymodifiers, FIELD_INTEGER ),
-	DEFINE_ARRAY( unused, FIELD_INTEGER, 5 ),		// remove/add as appropriate (grow back to 8 ints on version change!)
+	DEFINE_ARRAY( unused, FIELD_INTEGER, 7 ),		// remove/add as appropriate (grow back to 8 ints on version change!)
 END_BYTESWAP_DATADESC()
 
 BEGIN_BYTESWAP_DATADESC( mstudioevent_t )

createallprojects

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE-$0}")" || exit
+devtools/bin/vpc /vance +everything /mksln everything
+
+make -Bnwk -no-silent -j"$(nproc)" -feverything.mak | compiledb
+#bear -- make -Bnwk -no-silent -j"$(nproc)" -feverything.mak
+

creategameprojects

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE-$0}")" || exit
+devtools/bin/vpc /vance +game +shaders /mksln games
+
+make -Bnwk -no-silent -j"$(nproc)" -fgames.mak | compiledb
+#bear -- make -Bnwk -no-silent -j"$(nproc)" -fgames.mak

creategameprojects.bat

@@ -1,2 +1 @@
-devtools\bin\vpc.exe /vance +game +game_shader_dx9 /mksln games.sln
-pause
+devtools\bin\vpc.exe /vance +game +shaders /mksln games.sln