OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- replaced some NULLs with nullptr.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-06 09:39:35 +01:00
commit a11eea98b5
8 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/b_bot.cpp
View file

@ -71,14 +71,14 @@ DBot::DBot ()
void DBot::Clear ()
{
player = NULL;
player = nullptr;
Angle = 0.;
dest = NULL;
prev = NULL;
enemy = NULL;
missile = NULL;
mate = NULL;
last_mate = NULL;
dest = nullptr;
prev = nullptr;
enemy = nullptr;
missile = nullptr;
mate = nullptr;
last_mate = nullptr;
memset(&skill, 0, sizeof(skill));
t_active = 0;
t_respawn = 0;
@ -138,7 +138,7 @@ void DBot::Tick ()
{
Super::Tick ();
if (player->mo == NULL || bglobal.freeze)
if (player->mo == nullptr || bglobal.freeze)
{
return;
}
@ -176,7 +176,7 @@ CCMD (addbot)
if (argv.argc() > 1)
bglobal.SpawnBot (argv[1]);
else
bglobal.SpawnBot (NULL);
bglobal.SpawnBot (nullptr);
}
void FCajunMaster::ClearPlayer (int i, bool keepTeam)
@ -184,7 +184,7 @@ void FCajunMaster::ClearPlayer (int i, bool keepTeam)
if (players[i].mo)
{
players[i].mo->Destroy ();
players[i].mo = NULL;
players[i].mo = nullptr;
}
botinfo_t *bot = botinfo;
while (bot && stricmp (players[i].userinfo.GetName(), bot->name))
@ -194,10 +194,10 @@ void FCajunMaster::ClearPlayer (int i, bool keepTeam)
bot->inuse = BOTINUSE_No;
bot->lastteam = keepTeam ? players[i].userinfo.GetTeam() : TEAM_NONE;
}
if (players[i].Bot != NULL)
if (players[i].Bot != nullptr)
{
players[i].Bot->Destroy ();
players[i].Bot = NULL;
players[i].Bot = nullptr;
}
players[i].~player_t();
::new(&players[i]) player_t;
@ -261,7 +261,7 @@ void InitBotStuff()
while (sc.GetString())
{
PClassActor *wcls = PClass::FindActor(sc.String);
if (wcls != NULL && wcls->IsDescendantOf(NAME_Weapon))
if (wcls != nullptr && wcls->IsDescendantOf(NAME_Weapon))
{
BotInfoData bi = {};
sc.MustGetStringName(",");
@ -306,7 +306,7 @@ void InitBotStuff()
for(unsigned i=0;i<countof(warnbotmissiles);i++)
{
AActor *a = GetDefaultByName (warnbotmissiles[i]);
if (a != NULL)
if (a != nullptr)
{
a->flags3|=MF3_WARNBOT;
}