rebase tweaks

Author: MjnMixael

code/missioneditor/sexp_tree_opf.cpp

@@ -199,9 +199,9 @@ sexp_list_item *SexpTreeOPF::get_listing_opf_prop()
 	ptr = GET_FIRST(&obj_used_list);
 	while (ptr != END_OF_LIST(&obj_used_list)) {
 		if (ptr->type == OBJ_PROP) {
-			auto prop = prop_id_lookup(ptr->instance);
-			if (prop != nullptr) {
-				head.add_data(prop->prop_name);
+			auto p = prop_id_lookup(ptr->instance);
+			if (p != nullptr) {
+				head.add_data(p->prop_name);
 			}
 		}
 

fred2/sexp_tree_view.cpp

@@ -757,7 +757,7 @@ void sexp_tree_view::end_operator_edit(bool confirm)
 // now it also handles messages from the operator combo box
 BOOL sexp_tree_view::OnCommand(WPARAM wParam, LPARAM lParam)
 {
-	int i, id, data, node, op;
+	int id, data, node, op;
 
 	if ((item_index >= 0) && (item_index < total_nodes) && !tree_nodes.empty())
 		item_handle = tree_item_handle(tree_nodes[item_index]);