scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-09 17:52:08 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix for mantis 2303 and related issue in lua.cpp

Browse Source
This commit is contained in:
Wanderer committed 2010-09-26 11:32:18 +00:00
1 parent acf8f56b41
commit 2a6727136e
2 files changed
+15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/lua.cpp
+11
View File
@@ -4181,6 +4181,7 @@ ADE_FUNC(checkRayCollision, l_Object, "vector Start Point, vector End Point, [bo
obj = objh->objp;
int flags = 0;
int submodel = -1;
bool model_started = false;
switch(obj->type) {
case OBJ_SHIP:
@@ -4208,6 +4209,11 @@ ADE_FUNC(checkRayCollision, l_Object, "vector Start Point, vector End Point, [bo
if (model_num < 0)
return ADE_RETURN_NIL;
if (obj->type == OBJ_SHIP) {
ship_model_start(obj);
model_started = true;
}
mc_info hull_check;
hull_check.model_num = model_num;
@@ -4219,9 +4225,14 @@ ADE_FUNC(checkRayCollision, l_Object, "vector Start Point, vector End Point, [bo
hull_check.flags = flags;
if ( !model_collide(&hull_check) ) {
if (model_started)
ship_model_stop(obj);
return ADE_RETURN_NIL;
}
if (model_started)
ship_model_stop(obj);
if (local)
return ade_set_args(L, "o", l_Vector.Set(hull_check.hit_point));
else