From 44a4b8fd6dc7e84187aa47c5bba9f1ed28613db7 Mon Sep 17 00:00:00 2001
From: Marrub <marrub@greyserv.net>
Date: Mon, 9 Mar 2015 17:59:02 -0400
Subject: [PATCH] varied changes

---
 dlls/combat.cpp                 | 39 +++++++++++++++++++--------------
 dlls/h_export.cpp               |  7 ++----
 filecopy.bat                    |  2 +-
 projects/vs2010/.gitignore      |  1 +
 projects/vs2010/hl_cdll.vcxproj |  1 +
 projects/vs2010/hldll.vcxproj   |  1 +
 6 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/dlls/combat.cpp b/dlls/combat.cpp
index 5acd32b..83c4ce6 100644
--- a/dlls/combat.cpp
+++ b/dlls/combat.cpp
@@ -57,11 +57,12 @@ void CGib :: SpawnStickyGibs( entvars_t *pevVictim, Vector vecOrigin, int cGibs
 {
 	int i;
 
-	if ( g_Language == LANGUAGE_GERMAN )
+	// [marrub] :)
+	/*if ( g_Language == LANGUAGE_GERMAN )
 	{
 		// no sticky gibs in germany right now!
 		return; 
-	}
+	}*/
 
 	for ( i = 0 ; i < cGibs ; i++ )
 	{
@@ -126,16 +127,17 @@ void CGib :: SpawnHeadGib( entvars_t *pevVictim )
 {
 	CGib *pGib = GetClassPtr( (CGib *)NULL );
 
-	if ( g_Language == LANGUAGE_GERMAN )
+	// [marrub] :)
+	/*if ( g_Language == LANGUAGE_GERMAN )
 	{
 		pGib->Spawn( "models/germangibs.mdl" );// throw one head
 		pGib->pev->body = 0;
 	}
 	else
-	{
-		pGib->Spawn( "models/hgibs.mdl" );// throw one head
+	{*/
+		pGib->Spawn( "models/hgibs.mdl" ); // throw one head
 		pGib->pev->body = 0;
-	}
+	//}
 
 	if ( pevVictim )
 	{
@@ -188,13 +190,14 @@ void CGib :: SpawnRandomGibs( entvars_t *pevVictim, int cGibs, int human )
 	{
 		CGib *pGib = GetClassPtr( (CGib *)NULL );
 
-		if ( g_Language == LANGUAGE_GERMAN )
+		// [marrub] :)
+		/*if ( g_Language == LANGUAGE_GERMAN )
 		{
 			pGib->Spawn( "models/germangibs.mdl" );
 			pGib->pev->body = RANDOM_LONG(0,GERMAN_GIB_COUNT-1);
 		}
 		else
-		{
+		{*/
 			if ( human )
 			{
 				// human pieces
@@ -207,7 +210,7 @@ void CGib :: SpawnRandomGibs( entvars_t *pevVictim, int cGibs, int human )
 				pGib->Spawn( "models/agibs.mdl" );
 				pGib->pev->body = RANDOM_LONG(0,ALIEN_GIB_COUNT-1);
 			}
-		}
+		//}
 
 		if ( pevVictim )
 		{
@@ -258,11 +261,12 @@ BOOL CBaseMonster :: HasHumanGibs( void )
 	int myClass = Classify();
 
 	if ( myClass == CLASS_HUMAN_MILITARY ||
-		 myClass == CLASS_PLAYER_ALLY	||
+		 myClass == CLASS_PLAYER_ALLY	 ||
 		 myClass == CLASS_HUMAN_PASSIVE  ||
 		 myClass == CLASS_PLAYER )
-
-		 return TRUE;
+	{
+		return TRUE;
+	}
 
 	return FALSE;
 }
@@ -272,14 +276,15 @@ BOOL CBaseMonster :: HasAlienGibs( void )
 {
 	int myClass = Classify();
 
-	if ( myClass == CLASS_ALIEN_MILITARY ||
-		 myClass == CLASS_ALIEN_MONSTER	||
-		 myClass == CLASS_ALIEN_PASSIVE  ||
-		 myClass == CLASS_INSECT  ||
+	if ( myClass == CLASS_ALIEN_MILITARY  ||
+		 myClass == CLASS_ALIEN_MONSTER   ||
+		 myClass == CLASS_ALIEN_PASSIVE   ||
+		 myClass == CLASS_INSECT          ||
 		 myClass == CLASS_ALIEN_PREDATOR  ||
 		 myClass == CLASS_ALIEN_PREY )
-
+	{
 		 return TRUE;
+	}
 
 	return FALSE;
 }
diff --git a/dlls/h_export.cpp b/dlls/h_export.cpp
index a4d1f03..5f19180 100644
--- a/dlls/h_export.cpp
+++ b/dlls/h_export.cpp
@@ -39,12 +39,9 @@ globalvars_t  *gpGlobals;
 #ifdef _WIN32
 
 // Required DLL entry point
-BOOL WINAPI DllMain(
-   HINSTANCE hinstDLL,
-   DWORD fdwReason,
-   LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-	if      (fdwReason == DLL_PROCESS_ATTACH)
+	if (fdwReason == DLL_PROCESS_ATTACH)
     {
     }
 	else if (fdwReason == DLL_PROCESS_DETACH)
diff --git a/filecopy.bat b/filecopy.bat
index 3985593..fac7bbf 100755
--- a/filecopy.bat
+++ b/filecopy.bat
@@ -1,4 +1,4 @@
 rem @echo off
 rem echo %~f2
-p4 edit %~f2
+rem p4 edit %~f2
 @copy %1 %~f2
diff --git a/projects/vs2010/.gitignore b/projects/vs2010/.gitignore
index 4ac39e1..42d3b2c 100644
--- a/projects/vs2010/.gitignore
+++ b/projects/vs2010/.gitignore
@@ -5,3 +5,4 @@ ipch/
 *.sdf
 *.suo
 *.user
+*.opensdf
diff --git a/projects/vs2010/hl_cdll.vcxproj b/projects/vs2010/hl_cdll.vcxproj
index e415081..90d2aed 100644
--- a/projects/vs2010/hl_cdll.vcxproj
+++ b/projects/vs2010/hl_cdll.vcxproj
@@ -42,6 +42,7 @@
     <OutDir>$(Configuration)\$(ProjectName)\</OutDir>
     <TargetName>client</TargetName>
     <IntDir>$(Configuration)\$(ProjectName)\int\</IntDir>
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/projects/vs2010/hldll.vcxproj b/projects/vs2010/hldll.vcxproj
index 49b126d..6344fb8 100644
--- a/projects/vs2010/hldll.vcxproj
+++ b/projects/vs2010/hldll.vcxproj
@@ -42,6 +42,7 @@
     <OutDir>$(Configuration)\$(ProjectName)\</OutDir>
     <IntDir>$(Configuration)\$(ProjectName)\int\</IntDir>
     <TargetName>hl</TargetName>
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>