scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-10 04:31:34 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Trunk Sync r8013

Browse Source
This commit is contained in:
Zacam committed 2011-11-19 16:32:50 +00:00
1 parent dee12f104f
commit 6e648f5205
42 files changed
+420 -711
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/lua.cpp
+8 -1
View File
@@ -10712,6 +10712,8 @@ ADE_FUNC(drawTargetingBrackets, l_Graphics, "object Object, [boolean draw=true,
int bound_rc, pof;
int modelnum;
bool entered_frame = false;
SCP_list<jump_node>::iterator jnp;
if ( !(g3_in_frame( ) > 0 ) )
{
g3_start_frame( 0 );
@@ -10749,7 +10751,12 @@ ADE_FUNC(drawTargetingBrackets, l_Graphics, "object Object, [boolean draw=true,
bound_rc = model_find_2d_bound_min( modelnum, &targetp->orient, &targetp->pos,&x1,&y1,&x2,&y2 );
break;
case OBJ_JUMP_NODE:
modelnum = targetp->jnp->get_modelnum();
for (jnp = Jump_nodes.begin(); jnp != Jump_nodes.end(); ++jnp) {
if(jnp->get_obj() == targetp)
break;
}
modelnum = jnp->get_modelnum();
bound_rc = model_find_2d_bound_min( modelnum, &targetp->orient, &targetp->pos,&x1,&y1,&x2,&y2 );
break;
default: //Someone passed an invalid pointer.