Trunk sync r9275

This commit is contained in:
The_E committed 2012-10-27 14:25:44 +00:00
1 parent ce05f3a88a
commit e2fb98b862
42 files changed
+977 -96

No files matched your search

+2 -2
View File
@@ -6040,7 +6040,7 @@ 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_set_team_color(sip->default_team_name, "<none>", 0, 0);
}
//Make sure model is loaded
@@ -6112,7 +6112,7 @@ 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_set_team_color(sip->default_team_name, "<none>", 0, 0);
}
//Make sure model is loaded