Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Take vision range techs into account on ownership change (capturing or defeat). Solves an OOS, reviewed by wraitii, fixes #4279, refs #3989.

Browse Source 
This was SVN commit r18833.
This commit is contained in:
elexis 2016-10-15 18:22:10 +00:00
parent c24831387a
commit 0991c22026
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/simulation2/components/CCmpVision.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015 Wildfire Games.
/* Copyright (C) 2016 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -85,13 +85,14 @@ public:
{
case MT_OwnershipChanged:
{
if (!m_RevealShore)
break;
const CMessageOwnershipChanged& msgData = static_cast<const CMessageOwnershipChanged&> (msg);
if (msgData.entity != GetEntityId())
break;
ReloadRange();
if (!m_RevealShore)
break;
CmpPtr<ICmpRangeManager> cmpRangeManager(GetSystemEntity());
cmpRangeManager->RevealShore(msgData.from, false);
cmpRangeManager->RevealShore(msgData.to, true);
@ -102,20 +103,7 @@ public:
const CMessageValueModification& msgData = static_cast<const CMessageValueModification&> (msg);
if (msgData.component != L"Vision")
break;
CmpPtr<ICmpValueModificationManager> cmpValueModificationManager(GetSystemEntity());
if (!cmpValueModificationManager)
break;
entity_pos_t newRange = cmpValueModificationManager->ApplyModifications(L"Vision/Range", m_BaseRange, GetEntityId());
if (newRange == m_Range)
break;
// Update our vision range and broadcast message
entity_pos_t oldRange = m_Range;
m_Range = newRange;
CMessageVisionRangeChanged msg(GetEntityId(), oldRange, newRange);
GetSimContext().GetComponentManager().BroadcastMessage(msg);
ReloadRange();
break;
}
case MT_Deserialized:
@ -128,6 +116,23 @@ public:
}
}
virtual void ReloadRange()
{
CmpPtr<ICmpValueModificationManager> cmpValueModificationManager(GetSystemEntity());
if (!cmpValueModificationManager)
return;
entity_pos_t newRange = cmpValueModificationManager->ApplyModifications(L"Vision/Range", m_BaseRange, GetEntityId());
if (newRange == m_Range)
return;
// Update our vision range and broadcast message
entity_pos_t oldRange = m_Range;
m_Range = newRange;
CMessageVisionRangeChanged msg(GetEntityId(), oldRange, newRange);
GetSimContext().GetComponentManager().BroadcastMessage(msg);
}
virtual entity_pos_t GetRange()
{
return m_Range;