Skip to content

Commit fa07a29

Browse files
MjnMixaelMjnMixael
committed
appease Clang the Conquerer
1 parent 7ec28e1 commit fa07a29

File tree

27 files changed

+105
-264
lines changed

27 files changed

+105
-264
lines changed

‎code/lab/dialogs/lab_ui.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ void LabUi::build_weapon_subtype_list() const
9393
}
9494
}
9595

96-
void LabUi::build_prop_subtype_list() const
96+
void LabUi::build_prop_subtype_list()
9797
{
98-
for (size_t i = 0; i < Prop_categories.size(); i++) {
99-
with_TreeNode(Prop_categories[i].name.c_str())
98+
for (auto& propc : Prop_categories) {
99+
with_TreeNode(propc.name.c_str())
100100
{
101101
int prop_idx = 0;
102102

103103
for (auto const& class_def : Prop_info) {
104-
if (lcase_equal(class_def.category, Prop_categories[i].name)) {
104+
if (lcase_equal(class_def.category, propc.name)) {
105105
SCP_string node_label;
106106
sprintf(node_label, "##PropClassIndex%i", prop_idx);
107107
TreeNodeEx(node_label.c_str(),
@@ -198,7 +198,7 @@ void LabUi::build_object_list()
198198
}
199199
}
200200

201-
void LabUi::build_prop_list() const
201+
void LabUi::build_prop_list()
202202
{
203203
with_TreeNode("Prop Classes")
204204
{

‎code/lab/dialogs/lab_ui.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class LabUi {
3232
static void build_object_list();
3333
static void build_asteroid_list();
3434
static void build_debris_list();
35-
void build_prop_list() const;
36-
void build_prop_subtype_list() const;
35+
static void build_prop_list();
36+
static void build_prop_subtype_list();
3737
void build_background_list() const;
3838
void show_render_options();
3939
void show_object_options() const;

‎code/lab/manager/lab_manager.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "weapon/muzzleflash.h"
1616
#include "weapon/beam.h"
1717
#include "ai/aigoals.h"
18-
#include "prop/prop.h"
1918

2019
#include "freespace.h"
2120

‎code/lab/manager/lab_manager.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ class LabManager {
107107

108108
int Saved_cmdline_collisions_value;
109109

110-
bool isSafeForShips() {
110+
bool isSafeForShips() const {
111111
return CurrentMode == LabMode::Ship && CurrentObject != -1 && Objects[CurrentObject].type == OBJ_SHIP;
112112
}
113113

114-
bool isSafeForProps() {
114+
bool isSafeForProps() const {
115115
return CurrentMode == LabMode::Prop && CurrentObject != -1 && Objects[CurrentObject].type == OBJ_PROP;
116116
}
117117

118-
bool isSafeForWeapons() {
118+
bool isSafeForWeapons() const {
119119
bool valid = CurrentObject != -1 && (Objects[CurrentObject].type == OBJ_WEAPON || Objects[CurrentObject].type == OBJ_BEAM);
120120
return CurrentMode == LabMode::Weapon && valid;
121121
}

‎code/mission/missionparse.cpp‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5123,34 +5123,34 @@ void parse_wing(mission *pm)
51235123
// Goober5000 - wing creation stuff moved to post_process_ships_wings
51245124
}
51255125

5126-
void parse_prop(mission* pm)
5126+
void parse_prop(mission* /*pm*/)
51275127
{
5128-
parsed_prop prop;
5128+
parsed_prop p;
51295129
required_string("$Name:");
5130-
stuff_string(prop.name, F_NAME, NAME_LENGTH);
5130+
stuff_string(p.name, F_NAME, NAME_LENGTH);
51315131

51325132
// Maybe do this by name instead?
51335133
required_string("$Class:");
5134-
stuff_int(&prop.prop_info_index);
5134+
stuff_int(&p.prop_info_index);
51355135

51365136
required_string("$Location:");
5137-
stuff_vec3d(&prop.position);
5137+
stuff_vec3d(&p.position);
51385138

51395139
required_string("$Orientation:");
5140-
stuff_matrix(&prop.orientation);
5140+
stuff_matrix(&p.orientation);
51415141

51425142
// set flags
51435143
if (optional_string("+Flags:")) {
51445144
SCP_vector<SCP_string> unparsed;
5145-
parse_string_flag_list(prop.flags, Parse_prop_flags, Num_parse_prop_flags, &unparsed);
5145+
parse_string_flag_list(p.flags, Parse_prop_flags, Num_parse_prop_flags, &unparsed);
51465146
if (!unparsed.empty()) {
5147-
for (size_t k = 0; k < unparsed.size(); ++k) {
5148-
WarningEx(LOCATION, "Unknown flag in parse prop flags: %s", unparsed[k].c_str());
5147+
for (const auto& f : unparsed) {
5148+
WarningEx(LOCATION, "Unknown flag in parse prop flags: %s", f.c_str());
51495149
}
51505150
}
51515151
}
51525152

5153-
Parse_props.emplace_back(prop);
5153+
Parse_props.emplace_back(p);
51545154
}
51555155

51565156
void parse_wings(mission* pm)
@@ -5258,14 +5258,13 @@ void post_process_path_stuff()
52585258
// MjnMixael
52595259
void post_process_mission_props()
52605260
{
5261-
for (int i = 0; i < static_cast<int>(Parse_props.size()); i++) {
5262-
parsed_prop* propp = &Parse_props[i];
5263-
int objnum = prop_create(&propp->orientation, &propp->position, propp->prop_info_index, propp->name);
5261+
for (auto& propp : Parse_props) {
5262+
int objnum = prop_create(&propp.orientation, &propp.position, propp.prop_info_index, propp.name);
52645263

52655264
if (objnum >= 0) {
52665265
auto& obj = Objects[objnum];
52675266

5268-
if (propp->flags[Mission::Parse_Object_Flags::OF_No_collide]) {
5267+
if (propp.flags[Mission::Parse_Object_Flags::OF_No_collide]) {
52695268
obj.flags.remove(Object::Object_Flags::Collides);
52705269
}
52715270
}

‎code/object/collidedebrisship.cpp‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ int collide_debris_prop(obj_pair* pair)
462462
ship_override = scripting::hooks::OnDebrisCollision->isOverride(scripting::hooks::CollisionConditions{ {prop_objp, debris_objp} },
463463
scripting::hook_param_list(scripting::hook_param("Self", 'o', prop_objp),
464464
scripting::hook_param("Object", 'o', debris_objp),
465-
scripting::hook_param("Ship", 'o', prop_objp),
465+
scripting::hook_param("Prop", 'o', prop_objp),
466466
scripting::hook_param("Debris", 'o', debris_objp),
467467
scripting::hook_param("Hitpos", 'o', hitpos)));
468468
}
@@ -494,31 +494,6 @@ int collide_debris_prop(obj_pair* pair)
494494
collide_ship_ship_do_sound(&hitpos, prop_objp, debris_objp,false );
495495
}
496496

497-
if (scripting::hooks::OnDebrisCollision->isActive() && !(debris_override && !ship_override)) {
498-
// TODO PROP
499-
/*
500-
scripting::hooks::OnDebrisCollision->run(scripting::hooks::CollisionConditions{ {ship_objp, debris_objp} },
501-
scripting::hook_param_list(scripting::hook_param("Self", 'o', ship_objp),
502-
scripting::hook_param("Object", 'o', debris_objp),
503-
scripting::hook_param("Ship", 'o', ship_objp),
504-
scripting::hook_param("Debris", 'o', debris_objp),
505-
scripting::hook_param("Hitpos", 'o', hitpos)));
506-
*/
507-
}
508-
if (scripting::hooks::OnShipCollision->isActive() && ((debris_override && !ship_override) || (!debris_override && !ship_override)))
509-
{
510-
// TODO PROP
511-
/*
512-
scripting::hooks::OnShipCollision->run(scripting::hooks::CollisionConditions{ {ship_objp, debris_objp} },
513-
scripting::hook_param_list(scripting::hook_param("Self", 'o', debris_objp),
514-
scripting::hook_param("Object", 'o', ship_objp),
515-
scripting::hook_param("Ship", 'o', ship_objp),
516-
scripting::hook_param("Debris", 'o', debris_objp),
517-
scripting::hook_param("Hitpos", 'o', hitpos),
518-
scripting::hook_param("ShipSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel && (debris_hit_info.heavy == ship_objp))));
519-
*/
520-
}
521-
522497
return 0;
523498
}
524499
}
@@ -612,7 +587,7 @@ int collide_asteroid_prop(obj_pair* pair)
612587
{
613588
float asteroid_damage;
614589

615-
vec3d asteroid_vel = asteroid_objp->phys_info.vel;
590+
//vec3d asteroid_vel = asteroid_objp->phys_info.vel;
616591

617592
// do collision physics
618593
calculate_ship_ship_collision_physics(&asteroid_hit_info);
@@ -628,27 +603,6 @@ int collide_asteroid_prop(obj_pair* pair)
628603
collide_ship_ship_do_sound(&hitpos, prop_objp, asteroid_objp, false);
629604
}
630605

631-
// TODO PROP
632-
/*
633-
if (scripting::hooks::OnAsteroidCollision->isActive() && !(asteroid_override && !ship_override)) {
634-
scripting::hooks::OnAsteroidCollision->run(scripting::hooks::CollisionConditions{ {ship_objp, asteroid_objp} },
635-
scripting::hook_param_list(scripting::hook_param("Self", 'o', ship_objp),
636-
scripting::hook_param("Object", 'o', asteroid_objp),
637-
scripting::hook_param("Ship", 'o', ship_objp),
638-
scripting::hook_param("Asteroid", 'o', asteroid_objp),
639-
scripting::hook_param("Hitpos", 'o', hitpos)));
640-
}
641-
if (scripting::hooks::OnShipCollision->isActive() && ((asteroid_override && !ship_override) || (!asteroid_override && !ship_override)))
642-
{
643-
scripting::hooks::OnShipCollision->run(scripting::hooks::CollisionConditions{ {ship_objp, asteroid_objp} },
644-
scripting::hook_param_list(scripting::hook_param("Self", 'o', asteroid_objp),
645-
scripting::hook_param("Object", 'o', ship_objp),
646-
scripting::hook_param("Ship", 'o', ship_objp),
647-
scripting::hook_param("Asteroid", 'o', asteroid_objp),
648-
scripting::hook_param("Hitpos", 'o', hitpos),
649-
scripting::hook_param("ShipSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel && (asteroid_hit_info.heavy == ship_objp))));
650-
}*/
651-
652606
return 0;
653607
}
654608

‎code/object/collideshipship.cpp‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,41 +1806,6 @@ int collide_prop_ship(obj_pair* pair)
18061806
hud_shield_quadrant_hit(ship_objp, -1);
18071807
}
18081808

1809-
//FIX
1810-
if (!scripting::hooks::OnShipCollision->isActive()) {
1811-
return 0;
1812-
}
1813-
1814-
if (!(b_override && !a_override))
1815-
{
1816-
// TODO PROP
1817-
/*
1818-
scripting::hooks::OnShipCollision->run(scripting::hooks::CollisionConditions{ {A, B} },
1819-
scripting::hook_param_list(scripting::hook_param("Self", 'o', A),
1820-
scripting::hook_param("Object", 'o', B),
1821-
scripting::hook_param("Ship", 'o', A),
1822-
scripting::hook_param("ShipB", 'o', B),
1823-
scripting::hook_param("Hitpos", 'o', world_hit_pos),
1824-
scripting::hook_param("ShipSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel && (ship_ship_hit_info.heavy == A)),
1825-
scripting::hook_param("ShipBSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel && (ship_ship_hit_info.heavy == B))));
1826-
*/
1827-
}
1828-
if ((b_override && !a_override) || (!b_override && !a_override))
1829-
{
1830-
// Yes, this should be reversed.
1831-
// TODO PROP
1832-
/*
1833-
scripting::hooks::OnShipCollision->run(scripting::hooks::CollisionConditions{ {A, B} },
1834-
scripting::hook_param_list(scripting::hook_param("Self", 'o', B),
1835-
scripting::hook_param("Object", 'o', A),
1836-
scripting::hook_param("Ship", 'o', B),
1837-
scripting::hook_param("ShipB", 'o', A),
1838-
scripting::hook_param("Hitpos", 'o', world_hit_pos),
1839-
scripting::hook_param("ShipSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel && (ship_ship_hit_info.heavy == B)),
1840-
scripting::hook_param("ShipBSubmodel", 'o', scripting::api::l_Submodel.Set(smh), has_submodel && (ship_ship_hit_info.heavy == A))));
1841-
*/
1842-
}
1843-
18441809
return 0;
18451810
}
18461811
}

0 commit comments

Comments
 (0)