Browse Source

varied changes

Marrub 4 years ago
parent
commit
44a4b8fd6d
6 changed files with 28 additions and 23 deletions
  1. 22
    17
      dlls/combat.cpp
  2. 2
    5
      dlls/h_export.cpp
  3. 1
    1
      filecopy.bat
  4. 1
    0
      projects/vs2010/.gitignore
  5. 1
    0
      projects/vs2010/hl_cdll.vcxproj
  6. 1
    0
      projects/vs2010/hldll.vcxproj

+ 22
- 17
dlls/combat.cpp View File

@@ -57,11 +57,12 @@ void CGib :: SpawnStickyGibs( entvars_t *pevVictim, Vector vecOrigin, int cGibs
57 57
 {
58 58
 	int i;
59 59
 
60
-	if ( g_Language == LANGUAGE_GERMAN )
60
+	// [marrub] :)
61
+	/*if ( g_Language == LANGUAGE_GERMAN )
61 62
 	{
62 63
 		// no sticky gibs in germany right now!
63 64
 		return; 
64
-	}
65
+	}*/
65 66
 
66 67
 	for ( i = 0 ; i < cGibs ; i++ )
67 68
 	{
@@ -126,16 +127,17 @@ void CGib :: SpawnHeadGib( entvars_t *pevVictim )
126 127
 {
127 128
 	CGib *pGib = GetClassPtr( (CGib *)NULL );
128 129
 
129
-	if ( g_Language == LANGUAGE_GERMAN )
130
+	// [marrub] :)
131
+	/*if ( g_Language == LANGUAGE_GERMAN )
130 132
 	{
131 133
 		pGib->Spawn( "models/germangibs.mdl" );// throw one head
132 134
 		pGib->pev->body = 0;
133 135
 	}
134 136
 	else
135
-	{
136
-		pGib->Spawn( "models/hgibs.mdl" );// throw one head
137
+	{*/
138
+		pGib->Spawn( "models/hgibs.mdl" ); // throw one head
137 139
 		pGib->pev->body = 0;
138
-	}
140
+	//}
139 141
 
140 142
 	if ( pevVictim )
141 143
 	{
@@ -188,13 +190,14 @@ void CGib :: SpawnRandomGibs( entvars_t *pevVictim, int cGibs, int human )
188 190
 	{
189 191
 		CGib *pGib = GetClassPtr( (CGib *)NULL );
190 192
 
191
-		if ( g_Language == LANGUAGE_GERMAN )
193
+		// [marrub] :)
194
+		/*if ( g_Language == LANGUAGE_GERMAN )
192 195
 		{
193 196
 			pGib->Spawn( "models/germangibs.mdl" );
194 197
 			pGib->pev->body = RANDOM_LONG(0,GERMAN_GIB_COUNT-1);
195 198
 		}
196 199
 		else
197
-		{
200
+		{*/
198 201
 			if ( human )
199 202
 			{
200 203
 				// human pieces
@@ -207,7 +210,7 @@ void CGib :: SpawnRandomGibs( entvars_t *pevVictim, int cGibs, int human )
207 210
 				pGib->Spawn( "models/agibs.mdl" );
208 211
 				pGib->pev->body = RANDOM_LONG(0,ALIEN_GIB_COUNT-1);
209 212
 			}
210
-		}
213
+		//}
211 214
 
212 215
 		if ( pevVictim )
213 216
 		{
@@ -258,11 +261,12 @@ BOOL CBaseMonster :: HasHumanGibs( void )
258 261
 	int myClass = Classify();
259 262
 
260 263
 	if ( myClass == CLASS_HUMAN_MILITARY ||
261
-		 myClass == CLASS_PLAYER_ALLY	||
264
+		 myClass == CLASS_PLAYER_ALLY	 ||
262 265
 		 myClass == CLASS_HUMAN_PASSIVE  ||
263 266
 		 myClass == CLASS_PLAYER )
264
-
265
-		 return TRUE;
267
+	{
268
+		return TRUE;
269
+	}
266 270
 
267 271
 	return FALSE;
268 272
 }
@@ -272,14 +276,15 @@ BOOL CBaseMonster :: HasAlienGibs( void )
272 276
 {
273 277
 	int myClass = Classify();
274 278
 
275
-	if ( myClass == CLASS_ALIEN_MILITARY ||
276
-		 myClass == CLASS_ALIEN_MONSTER	||
277
-		 myClass == CLASS_ALIEN_PASSIVE  ||
278
-		 myClass == CLASS_INSECT  ||
279
+	if ( myClass == CLASS_ALIEN_MILITARY  ||
280
+		 myClass == CLASS_ALIEN_MONSTER   ||
281
+		 myClass == CLASS_ALIEN_PASSIVE   ||
282
+		 myClass == CLASS_INSECT          ||
279 283
 		 myClass == CLASS_ALIEN_PREDATOR  ||
280 284
 		 myClass == CLASS_ALIEN_PREY )
281
-
285
+	{
282 286
 		 return TRUE;
287
+	}
283 288
 
284 289
 	return FALSE;
285 290
 }

+ 2
- 5
dlls/h_export.cpp View File

@@ -39,12 +39,9 @@ globalvars_t  *gpGlobals;
39 39
 #ifdef _WIN32
40 40
 
41 41
 // Required DLL entry point
42
-BOOL WINAPI DllMain(
43
-   HINSTANCE hinstDLL,
44
-   DWORD fdwReason,
45
-   LPVOID lpvReserved)
42
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
46 43
 {
47
-	if      (fdwReason == DLL_PROCESS_ATTACH)
44
+	if (fdwReason == DLL_PROCESS_ATTACH)
48 45
     {
49 46
     }
50 47
 	else if (fdwReason == DLL_PROCESS_DETACH)

+ 1
- 1
filecopy.bat View File

@@ -1,4 +1,4 @@
1 1
 rem @echo off
2 2
 rem echo %~f2
3
-p4 edit %~f2
3
+rem p4 edit %~f2
4 4
 @copy %1 %~f2

+ 1
- 0
projects/vs2010/.gitignore View File

@@ -5,3 +5,4 @@ ipch/
5 5
 *.sdf
6 6
 *.suo
7 7
 *.user
8
+*.opensdf

+ 1
- 0
projects/vs2010/hl_cdll.vcxproj View File

@@ -42,6 +42,7 @@
42 42
     <OutDir>$(Configuration)\$(ProjectName)\</OutDir>
43 43
     <TargetName>client</TargetName>
44 44
     <IntDir>$(Configuration)\$(ProjectName)\int\</IntDir>
45
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
45 46
   </PropertyGroup>
46 47
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 48
     <LinkIncremental>false</LinkIncremental>

+ 1
- 0
projects/vs2010/hldll.vcxproj View File

@@ -42,6 +42,7 @@
42 42
     <OutDir>$(Configuration)\$(ProjectName)\</OutDir>
43 43
     <IntDir>$(Configuration)\$(ProjectName)\int\</IntDir>
44 44
     <TargetName>hl</TargetName>
45
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
45 46
   </PropertyGroup>
46 47
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
47 48
     <LinkIncremental>false</LinkIncremental>

Loading…
Cancel
Save