qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the leading _ from entity fields for properties.

Browse source 
Dealing with the _ in the properties code is a bit messy, and having to use
it in the properties list file is a pain.
This commit is contained in:
Bill Currie 2012-12-26 15:28:14 +09:00
parent 5fbe50a5e2
commit 9e6477fdf0
3 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tools/qflight/include/properties.h
View file

@ -126,19 +126,19 @@ int parse_noise (const char *arg);
will be ignored.
Supported properties:
\arg \c light/_light see \ref parse_light
\arg \c light see \ref parse_light
\arg \c style light style: 0-254
\arg \c angle spotlight con angle in degress. defaults to 20
\arg \c wait light "falloff". defaults to 1.0
\arg \c _lightradius size of light. interacts with falloff for
\arg \c lightradius size of light. interacts with falloff for
distance clipping (?). defaults to 0
\arg \c color/_color see \ref parse_color
\arg \c _attenuation see \ref parse_attenuation
\arg \c _radius the range of the light.
\arg \c _noise noise intensity (?)
\arg \c _noisetype see \ref parse_noise
\arg \c _persistence noise parameter
\arg \c _resolution noise parameter
\arg \c color see \ref parse_color
\arg \c attenuation see \ref parse_attenuation
\arg \c radius the range of the light.
\arg \c noise noise intensity (?)
\arg \c noisetype see \ref parse_noise
\arg \c persistence noise parameter
\arg \c resolution noise parameter
\param ent The entity for which to set the lighting values.
\param dict A dictionary property list item representing the fields

8
tools/qflight/source/entities.c
View file

@ -226,8 +226,6 @@ LoadEntities (void)
epair->next = entity->epairs;
entity->epairs = epair;
PL_D_AddObject (dict, key, PL_NewString (script->token->str));
if (!strcmp (key, "classname"))
entity->classname = epair->value;
else if (!strcmp (key, "target"))
@ -243,6 +241,12 @@ LoadEntities (void)
else
VectorCopy (vec, entity->origin);
}
// the leading _ is so the engine doesn't search for the field,
// but it's not wanted in the properties dictionary
if (*key == '_')
key++;
PL_D_AddObject (dict, key, PL_NewString (script->token->str));
}
if (options.verbosity > 1 && entity->targetname)

22
tools/qflight/source/properties.c
View file

@ -173,7 +173,7 @@ set_properties (entity_t *ent, plitem_t *dict)
if (properties) {
prop = PL_ObjectForKey (properties, ent->classname);
if ((p = get_item ("_light_name", dict, 0))
if ((p = get_item ("light_name", dict, 0))
&& (str = PL_String (p)))
prop = PL_ObjectForKey (properties, str);
if (!prop)
@ -183,8 +183,7 @@ set_properties (entity_t *ent, plitem_t *dict)
if (!prop)
prop = PL_ObjectForKey (properties, "default");
}
if ((p = get_item ("light", dict, prop))
|| (p = get_item ("_light", dict, prop))) {
if ((p = get_item ("light", dict, prop))) {
if ((str = PL_String (p))) {
ent->light = parse_light (str, ent->color);
}
@ -208,18 +207,17 @@ set_properties (entity_t *ent, plitem_t *dict)
ent->falloff *= ent->falloff; // presquared
}
}
if ((p = get_item ("_lightradius", dict, prop))) {
if ((p = get_item ("lightradius", dict, prop))) {
if ((str = PL_String (p))) {
ent->lightradius = parse_float (str);
}
}
if ((p = get_item ("color", dict, prop))
|| (p = get_item ("_color", dict, prop))) {
if ((p = get_item ("color", dict, prop))) {
if ((str = PL_String (p))) {
parse_color (str, ent->color2);
}
}
if ((p = get_item ("_attenuation", dict, prop))) {
if ((p = get_item ("attenuation", dict, prop))) {
if ((str = PL_String (p))) {
ent->attenuation = parse_attenuation (str);
if (ent->attenuation == -1) {
@ -229,27 +227,27 @@ set_properties (entity_t *ent, plitem_t *dict)
}
}
}
if ((p = get_item ("_radius", dict, prop))) {
if ((p = get_item ("radius", dict, prop))) {
if ((str = PL_String (p))) {
ent->radius = parse_float (str);
}
}
if ((p = get_item ("_noise", dict, prop))) {
if ((p = get_item ("noise", dict, prop))) {
if ((str = PL_String (p))) {
ent->noise = parse_float (str);
}
}
if ((p = get_item ("_noisetype", dict, prop))) {
if ((p = get_item ("noisetype", dict, prop))) {
if ((str = PL_String (p))) {
ent->noisetype = parse_noise (str);
}
}
if ((p = get_item ("_persistence", dict, prop))) {
if ((p = get_item ("persistence", dict, prop))) {
if ((str = PL_String (p))) {
ent->persistence = parse_float (str);
}
}
if ((p = get_item ("_resolution", dict, prop))) {
if ((p = get_item ("resolution", dict, prop))) {
if ((str = PL_String (p))) {
ent->resolution = parse_float (str);
}