olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: fix MatchTargets

This commit is contained in:
Eric Wasylishen 2016-07-26 12:31:45 -06:00
parent 9535635b86
commit b71ae5a200
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/light/entities.hh
View File

@ -61,7 +61,7 @@ public:
std::map<std::string, std::string> epairs;
const entity_t *targetent;
const entdict_t *targetent;
qboolean generated; // if true, don't write to the bsp

11
light/entities.cc
View File

@ -115,7 +115,7 @@ LightStyleForTargetname(const std::string &targetname)
* ==================
* MatchTargets
*
* all_lights should not be modified after this (saves pointers to elements)
* entdicts should not be modified after this (saves pointers to elements)
* ==================
*/
static void
@ -127,8 +127,8 @@ MatchTargets(void)
continue;
bool found = false;
for (const entity_t &target : all_lights) {
if (targetstr == ValueForKey(&target, "targetname")) {
for (const entdict_t &target : entdicts) {
if (targetstr == EntDict_StringForKey(target, "targetname")) {
entity.targetent = &target;
found = true;
break;
@ -152,8 +152,9 @@ SetupSpotlights(void)
if (strncmp(entity.classname(), "light", 5))
continue;
if (entity.targetent) {
VectorSubtract(*entity.targetent->origin.vec3Value(), *entity.origin.vec3Value(),
entity.spotvec);
vec3_t targetOrigin;
GetVectorForKey(entity.targetent, "origin", targetOrigin);
VectorSubtract(targetOrigin, *entity.origin.vec3Value(), entity.spotvec);
VectorNormalize(entity.spotvec);
entity.spotlight = true;
}