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

Trunk sync r9057

Browse Source
This commit is contained in:
The_E committed 2012-07-28 21:09:28 +00:00
1 parent 68be57e92b
commit 2c729eee15
40 files changed
+632 -103
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/lua.cpp
+12
View File
@@ -5740,6 +5740,11 @@ ADE_FUNC(renderTechModel, l_Shipclass, "X1, Y1, X2, Y2, [Rotation %, Pitch %, Ba
ship_info *sip = &Ship_info[idx];
if (sip->uses_team_colors) {
gr_set_team_color(sip->default_team_name);
gr_enable_team_color();
}
//Make sure model is loaded
sip->model_num = model_load(sip->pof_file, sip->n_subsystems, &sip->subsystems[0], 0);
@@ -5785,6 +5790,7 @@ ADE_FUNC(renderTechModel, l_Shipclass, "X1, Y1, X2, Y2, [Rotation %, Pitch %, Ba
//Bye!!
g3_end_frame();
gr_reset_clip();
gr_disable_team_color();
return ade_set_args(L, "b", true);
}
@@ -5807,6 +5813,11 @@ ADE_FUNC(renderTechModel2, l_Shipclass, "X1, Y1, X2, Y2, orientation Orientation
ship_info *sip = &Ship_info[idx];
if (sip->uses_team_colors) {
gr_set_team_color(sip->default_team_name);
gr_enable_team_color();
}
//Make sure model is loaded
sip->model_num = model_load(sip->pof_file, sip->n_subsystems, &sip->subsystems[0], 0);
@@ -5845,6 +5856,7 @@ ADE_FUNC(renderTechModel2, l_Shipclass, "X1, Y1, X2, Y2, orientation Orientation
//Bye!!
g3_end_frame();
gr_reset_clip();
gr_disable_team_color();
return ade_set_args(L, "b", true);
}