some variable cleanup

Author: MjnMixael

code/prop/prop.cpp

@@ -54,13 +54,13 @@ int prop_name_lookup(const char *name)
 	Assertion(name != nullptr, "NULL name passed to prop_name_lookup");
 
 	for (size_t i=0; i < Props.size(); i++){
-		auto prop = Props[i] ? &Props[i].value() : nullptr;
-		if (prop == nullptr) {
+		auto p = Props[i] ? &Props[i].value() : nullptr;
+		if (p == nullptr) {
 			continue;
 		}
-		if (prop->objnum >= 0){
-			if (Objects[prop->objnum].type == OBJ_PROP) {
-				if (!stricmp(name, prop->prop_name)) {
+		if (p->objnum >= 0){
+			if (Objects[p->objnum].type == OBJ_PROP) {
+				if (!stricmp(name, p->prop_name)) {
 					return static_cast<int>(i);
 				}
 			}

code/ship/shipfx.cpp

@@ -829,17 +829,17 @@ bool shipfx_eye_in_shadow( vec3d *eye_pos, object * src_obj, int light_n )
 		}
 	}
 
-	for (const auto& prop : Props) {
-		if (prop.has_value()) {
-			objp = &Objects[prop->objnum];
+	for (const auto& p : Props) {
+		if (p.has_value()) {
+			objp = &Objects[p->objnum];
 			if (objp->flags[Object::Object_Flags::Should_be_dead])
 				continue;
 
 			if (src_obj != objp) {
 				vm_vec_scale_add(&rp1, &rp0, &light_dir, objp->radius * 10.0f);
 
-				mc.model_instance_num = prop->model_instance_num;
-				mc.model_num = Prop_info[prop->prop_info_index].model_num;
+				mc.model_instance_num = p->model_instance_num;
+				mc.model_num = Prop_info[p->prop_info_index].model_num;
 				mc.orient = &objp->orient;
 				mc.pos = &objp->pos;
 				mc.p0 = &rp0;

code/weapon/beam.cpp

@@ -3354,7 +3354,6 @@ int beam_collide_prop(obj_pair* pair)
 	beam* a_beam;
 	object* weapon_objp;
 	object* prop_objp;
-	weapon_info* bwi;
 	mc_info mc;
 	int model_num;
 	float width;
@@ -3403,8 +3402,6 @@ int beam_collide_prop(obj_pair* pair)
 	prop_objp = pair->b;
 	prop* propp = prop_id_lookup(prop_objp->instance);
 
-	bwi = &Weapon_info[a_beam->weapon_info_index];
-
 	// get the width of the beam
 	width = a_beam->beam_collide_width * a_beam->current_width_factor;