varied changes

master
Marrub 2015-03-09 17:59:02 -04:00
Parent 5d761709a3
révision 44a4b8fd6d
6 fichiers modifiés avec 28 ajouts et 23 suppressions

Voir le fichier

@ -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;
}

Voir le fichier

@ -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)

Voir le fichier

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

Voir le fichier

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

Voir le fichier

@ -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>

Voir le fichier

@ -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>