Skip to content

Commit 560ef58

Browse files
MjnMixaelMjnMixael
committed
appease Clang the Conquerer
1 parent 9bf7a5e commit 560ef58

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(),
@@ -204,7 +204,7 @@ void LabUi::build_object_list()
204204
}
205205
}
206206

207-
void LabUi::build_prop_list() const
207+
void LabUi::build_prop_list()
208208
{
209209
with_TreeNode("Prop Classes")
210210
{

‎code/lab/dialogs/lab_ui.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class LabUi {
2727
static void build_object_list();
2828
static void build_asteroid_list();
2929
static void build_debris_list();
30-
void build_prop_list() const;
31-
void build_prop_subtype_list() const;
30+
static void build_prop_list();
31+
static void build_prop_subtype_list();
3232
void build_background_list() const;
3333
void show_render_options();
3434
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
@@ -14,7 +14,6 @@
1414
#include "weapon/muzzleflash.h"
1515
#include "weapon/beam.h"
1616
#include "ai/aigoals.h"
17-
#include "prop/prop.h"
1817

1918
#include "freespace.h"
2019

‎code/lab/manager/lab_manager.h‎

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

9090
int Saved_cmdline_collisions_value;
9191

92-
bool isSafeForShips() {
92+
bool isSafeForShips() const {
9393
return CurrentMode == LabMode::Ship && CurrentObject != -1 && Objects[CurrentObject].type == OBJ_SHIP;
9494
}
9595

96-
bool isSafeForProps() {
96+
bool isSafeForProps() const {
9797
return CurrentMode == LabMode::Prop && CurrentObject != -1 && Objects[CurrentObject].type == OBJ_PROP;
9898
}
9999

100-
bool isSafeForWeapons() {
100+
bool isSafeForWeapons() const {
101101
bool valid = CurrentObject != -1 && (Objects[CurrentObject].type == OBJ_WEAPON || Objects[CurrentObject].type == OBJ_BEAM);
102102
return CurrentMode == LabMode::Weapon && valid;
103103
}

‎code/mission/missionparse.cpp‎

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

4951-
void parse_prop(mission* pm)
4951+
void parse_prop(mission* /*pm*/)
49524952
{
4953-
parsed_prop prop;
4953+
parsed_prop p;
49544954
required_string("$Name:");
4955-
stuff_string(prop.name, F_NAME, NAME_LENGTH);
4955+
stuff_string(p.name, F_NAME, NAME_LENGTH);
49564956

49574957
// Maybe do this by name instead?
49584958
required_string("$Class:");
4959-
stuff_int(&prop.prop_info_index);
4959+
stuff_int(&p.prop_info_index);
49604960

49614961
required_string("$Location:");
4962-
stuff_vec3d(&prop.position);
4962+
stuff_vec3d(&p.position);
49634963

49644964
required_string("$Orientation:");
4965-
stuff_matrix(&prop.orientation);
4965+
stuff_matrix(&p.orientation);
49664966

49674967
// set flags
49684968
if (optional_string("+Flags:")) {
49694969
SCP_vector<SCP_string> unparsed;
4970-
parse_string_flag_list(prop.flags, Parse_prop_flags, Num_parse_prop_flags, &unparsed);
4970+
parse_string_flag_list(p.flags, Parse_prop_flags, Num_parse_prop_flags, &unparsed);
49714971
if (!unparsed.empty()) {
4972-
for (size_t k = 0; k < unparsed.size(); ++k) {
4973-
WarningEx(LOCATION, "Unknown flag in parse prop flags: %s", unparsed[k].c_str());
4972+
for (const auto& f : unparsed) {
4973+
WarningEx(LOCATION, "Unknown flag in parse prop flags: %s", f.c_str());
49744974
}
49754975
}
49764976
}
49774977

4978-
Parse_props.emplace_back(prop);
4978+
Parse_props.emplace_back(p);
49794979
}
49804980

49814981
void parse_wings(mission* pm)
@@ -5083,14 +5083,13 @@ void post_process_path_stuff()
50835083
// MjnMixael
50845084
void post_process_mission_props()
50855085
{
5086-
for (int i = 0; i < static_cast<int>(Parse_props.size()); i++) {
5087-
parsed_prop* propp = &Parse_props[i];
5088-
int objnum = prop_create(&propp->orientation, &propp->position, propp->prop_info_index, propp->name);
5086+
for (auto& propp : Parse_props) {
5087+
int objnum = prop_create(&propp.orientation, &propp.position, propp.prop_info_index, propp.name);
50895088

50905089
if (objnum >= 0) {
50915090
auto& obj = Objects[objnum];
50925091

5093-
if (propp->flags[Mission::Parse_Object_Flags::OF_No_collide]) {
5092+
if (propp.flags[Mission::Parse_Object_Flags::OF_No_collide]) {
50945093
obj.flags.remove(Object::Object_Flags::Collides);
50955094
}
50965095
}

‎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
@@ -1800,41 +1800,6 @@ int collide_prop_ship(obj_pair* pair)
18001800
hud_shield_quadrant_hit(ship_objp, -1);
18011801
}
18021802

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

0 commit comments

Comments
 (0)