Skip to content

Commit

Permalink
Random spawn point selection with items accounting.
Browse files Browse the repository at this point in the history
  • Loading branch information
@LevShisterov
LevShisterov committed Sep 30, 2022
1 parent d3451b0 commit c545b8a
Show file tree
Hide file tree
Showing 2 changed files with 244 additions and 90 deletions.
154 changes: 78 additions & 76 deletions dlls/h_export.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,78 @@
/***
*
* Copyright (c) 1996-2002, Valve LLC. All rights reserved.
*
* This product contains software technology licensed from Id
* Software, Inc. ("Id Technology"). Id Technology (c) 1996 Id Software, Inc.
* All Rights Reserved.
*
* Use, distribution, and modification of this source code and/or resulting
* object code is restricted to non-commercial enhancements to products from
* Valve LLC. All other use, distribution, or modification is prohibited
* without written permission from Valve LLC.
*
****/
/*
===== h_export.cpp ========================================================
Entity classes exported by Halflife.
*/

#include "extdll.h"
#include "util.h"

#include "cbase.h"

// Holds engine functionality callbacks
enginefuncs_t g_engfuncs;
globalvars_t *gpGlobals;

#ifdef _WIN32

// Required DLL entry point
BOOL WINAPI DllMain(
HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
if (fdwReason == DLL_PROCESS_ATTACH)
{
}
else if (fdwReason == DLL_PROCESS_DETACH)
{
}
return TRUE;
}

void DLLEXPORT GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
{
memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
gpGlobals = pGlobals;

char gd[MAX_PATH];
GET_GAME_DIR(gd);
g_iIsAg = strcmp(gd, "ag") == 0 ? 1 : 0;
}


#else

extern "C" {

void GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
{
memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
gpGlobals = pGlobals;

char gd[MAX_PATH];
GET_GAME_DIR(gd);
g_iIsAg = strcmp(gd, "ag") == 0 ? 1 : 0;
}

}

#endif
/***
*
* Copyright (c) 1996-2002, Valve LLC. All rights reserved.
*
* This product contains software technology licensed from Id
* Software, Inc. ("Id Technology"). Id Technology (c) 1996 Id Software, Inc.
* All Rights Reserved.
*
* Use, distribution, and modification of this source code and/or resulting
* object code is restricted to non-commercial enhancements to products from
* Valve LLC. All other use, distribution, or modification is prohibited
* without written permission from Valve LLC.
*
****/
/*
===== h_export.cpp ========================================================
Entity classes exported by Halflife.
*/

#include "extdll.h"
#include "util.h"

#include "cbase.h"
#include <time.h>

// Holds engine functionality callbacks
enginefuncs_t g_engfuncs;
globalvars_t *gpGlobals;

#ifdef _WIN32

// Required DLL entry point
BOOL WINAPI DllMain(
HINSTANCE hinstDLL,
DWORD fdwReason,
LPVOID lpvReserved)
{
if (fdwReason == DLL_PROCESS_ATTACH)
{
}
else if (fdwReason == DLL_PROCESS_DETACH)
{
}
return TRUE;
}

void DLLEXPORT GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
{
srand(time(nullptr));
memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
gpGlobals = pGlobals;

char gd[MAX_PATH];
GET_GAME_DIR(gd);
g_iIsAg = strcmp(gd, "ag") == 0 ? 1 : 0;
}


#else

extern "C" {

void GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine, globalvars_t *pGlobals )
{
memcpy(&g_engfuncs, pengfuncsFromEngine, sizeof(enginefuncs_t));
gpGlobals = pGlobals;

char gd[MAX_PATH];
GET_GAME_DIR(gd);
g_iIsAg = strcmp(gd, "ag") == 0 ? 1 : 0;
}

}

#endif
180 changes: 166 additions & 14 deletions dlls/player.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2791,30 +2791,159 @@ void CBasePlayer::PostThink()
}


enum SpawnPointValidity
{
Valid = 0,
NonValid = 1,
HasPlayers = 2,
};

struct SpotInfo
{
CBaseEntity* Spot;
float ItemsWeight;
SpawnPointValidity Validity;
};

const int HalfPlayerHeight = 36;
const int HeightTolerance = 20;
const float ItemSearchRadius = 512;

// checks if the spot is clear of players
BOOL IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot )
SpawnPointValidity IsSpawnPointValid( CBaseEntity *pPlayer, CBaseEntity *pSpot )
{
CBaseEntity *ent = NULL;

if ( pSpot->pev->origin == Vector( 0, 0, 0 ) )
{
return NonValid;
}

if ( !pSpot->IsTriggered( pPlayer ) )
{
return FALSE;
return NonValid;
}

while ( (ent = UTIL_FindEntityInSphere( ent, pSpot->pev->origin, 128 )) != NULL )
while ( (ent = UTIL_FindEntityInSphere( ent, pSpot->pev->origin, HalfPlayerHeight * 4 )) != NULL )
{
// if ent is a client, don't spawn on 'em
if ( ent->IsPlayer() && ent != pPlayer )
return FALSE;
return HasPlayers;
}

return TRUE;
return Valid;
}


DLL_GLOBAL CBaseEntity *g_pLastSpawn;
inline int FNullEnt( CBaseEntity *ent ) { return (ent == NULL) || FNullEnt( ent->edict() ); }

float GetItemWeight(CBasePlayerItem* item)
{
ItemInfo p;
if (item->GetItemInfo(&p) && p.iWeight > 0)
{
return (float)p.iWeight / 10;
}

return 1.0f;
}

bool IsSameFloor(vec3_t spot, vec3_t item)
{
return
(spot.z - HalfPlayerHeight - HeightTolerance <= item.z) &&
(spot.z + HalfPlayerHeight + HeightTolerance >= item.z);
}

float CountEntitesInSphere(vec3_t point)
{
float weight = 0;
CBaseEntity* ent = NULL;
while ((ent = UTIL_FindEntityInSphere(ent, point, ItemSearchRadius)) != NULL)
{
CBasePlayerItem* item = dynamic_cast<CBasePlayerItem*> (ent);
if (item == NULL || (item->pev->effects & EF_NODRAW) == EF_NODRAW)
continue;
weight += GetItemWeight(item);
if (IsSameFloor(point, item->pev->origin))
weight += 2.0f;
}
return weight;
}

int SortSpots(SpotInfo spotInfos[], int spotsCount)
{
int validSpotsCount = 0;
SpotInfo replacement;
for (int i = 0; i < spotsCount; i++)
{
// Search for max weight separately for valid and non valid spots
float maxWeightForValid = 0;
int maxWeightIndexForValid = -1;
float maxWeightForNonValid = 0;
int maxWeightIndexForNonValid = -1;
for (int j = i + 1; j < spotsCount; j++)
{
if (spotInfos[j].Validity == Valid)
{
if (spotInfos[j].ItemsWeight >= maxWeightForValid)
{
maxWeightForValid = spotInfos[j].ItemsWeight;
maxWeightIndexForValid = j;
}
}
else
{
if (spotInfos[j].ItemsWeight >= maxWeightForNonValid)
{
maxWeightForNonValid = spotInfos[j].ItemsWeight;
maxWeightIndexForNonValid = j;
}
}
}
if (maxWeightIndexForValid < 0 && maxWeightIndexForNonValid < 0)
{
if (spotInfos[i].Validity == Valid)
validSpotsCount++;
break;
}
// Select spot to exchange, valid ones first
int reaplceIndex = -1;
if (maxWeightIndexForValid > 0)
{
validSpotsCount = i + 1;
if (spotInfos[i].Validity != Valid ||
spotInfos[i].ItemsWeight < maxWeightForValid)
reaplceIndex = maxWeightIndexForValid;
}
else if (maxWeightIndexForNonValid > 0)
{
if (spotInfos[i].ItemsWeight < maxWeightForNonValid)
reaplceIndex = maxWeightIndexForNonValid;
}
// Exchange spots
if (reaplceIndex > 0)
{
replacement = spotInfos[i];
spotInfos[i] = spotInfos[reaplceIndex];
spotInfos[reaplceIndex] = replacement;
}
}
return validSpotsCount;
}

void ClearSpawn(CBaseEntity* pSpot, edict_t* player)
{
CBaseEntity* ent = NULL;
while ((ent = UTIL_FindEntityInSphere(ent, pSpot->pev->origin, 128)) != NULL)
{
// if ent is a client, kill em (unless they are ourselves)
if (ent->IsPlayer() && !(ent->edict() == player))
ent->TakeDamage(VARS(INDEXENT(0)), VARS(INDEXENT(0)), 300, DMG_GENERIC);
}
}

/*
============
EntSelectSpawnPoint
Expand All @@ -2826,8 +2955,10 @@ USES AND SETS GLOBAL g_pLastSpawn
*/
edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer )
{
const int MaxSpots = 100;
CBaseEntity *pSpot;
edict_t *player;
SpotInfo spotInfos[MaxSpots];

player = pPlayer->edict();

Expand All @@ -2843,12 +2974,39 @@ edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer )
}
else if ( g_pGameRules->IsDeathmatch() )
{
// New way to find spawn spot: count items around
int spotsCount = 0;
pSpot = NULL;
while ((pSpot = UTIL_FindEntityByClassname(pSpot, "info_player_deathmatch")) != NULL)
{
spotInfos[spotsCount].Spot = pSpot;
spotInfos[spotsCount].ItemsWeight = CountEntitesInSphere(pSpot->pev->origin);
spotInfos[spotsCount].Validity = IsSpawnPointValid(pPlayer, pSpot);
spotsCount++;
if (spotsCount == MaxSpots)
break;
}
int validSpots = SortSpots(spotInfos, spotsCount);
int limit = validSpots;
if (limit == 0)
limit = spotsCount;
else if (limit > 10 && rand() % 3)
limit = 10;
int take = rand() % limit;
pSpot = spotInfos[take].Spot;
if (spotInfos[take].Validity == HasPlayers)
ClearSpawn(pSpot, player);

goto ReturnSpot;


// Old way to find spawn spot
pSpot = g_pLastSpawn;
// Randomize the start spot
for ( int i = RANDOM_LONG(1,5); i > 0; i-- )
pSpot = UTIL_FindEntityByClassname( pSpot, "info_player_deathmatch" );
if ( FNullEnt( pSpot ) ) // skip over the null point
pSpot = UTIL_FindEntityByClassname( pSpot, "info_player_deathmatch" );
if ( FNullEnt( pSpot ) ) // skip over the null point
pSpot = UTIL_FindEntityByClassname( pSpot, "info_player_deathmatch" );

CBaseEntity *pFirstSpot = pSpot;

Expand Down Expand Up @@ -2876,13 +3034,7 @@ edict_t *EntSelectSpawnPoint( CBaseEntity *pPlayer )
// we haven't found a place to spawn yet, so kill any guy at the first spawn point and spawn there
if ( !FNullEnt( pSpot ) )
{
CBaseEntity *ent = NULL;
while ( (ent = UTIL_FindEntityInSphere( ent, pSpot->pev->origin, 128 )) != NULL )
{
// if ent is a client, kill em (unless they are ourselves)
if ( ent->IsPlayer() && !(ent->edict() == player) )
ent->TakeDamage( VARS(INDEXENT(0)), VARS(INDEXENT(0)), 300, DMG_GENERIC );
}
ClearSpawn(pSpot, player);
goto ReturnSpot;
}
}
Expand Down

0 comments on commit c545b8a

Please sign in to comment.