jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-05-13 16:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix D3Editor compilation

Browse Source
This commit is contained in:
Azamat H. Hackimov
2024-07-18 23:21:14 +03:00
parent c76fc45fda
commit 61ed7cedcf
2 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editor/PreferencesDialog.cpp
View File

@@ -96,6 +96,9 @@
// PreferencesDialog.cpp : implementation file
//
#include <string>
#include <vector>
#include "stdafx.h"
#include "editor.h"
#include "PreferencesDialog.h"
@@ -183,9 +186,11 @@ void CPreferencesDialog::OnOK() {
CComboBox *combo = (CComboBox *)GetDlgItem(IDC_DEFAULT_PILOT);
if (combo->GetCount()) {
combo->GetLBText(combo->GetCurSel(), Default_pilot);
char temp[_MAX_PATH];
combo->GetLBText(combo->GetCurSel(), temp);
Default_pilot = temp;
} else {
strcpy(Default_pilot, " ");
Default_pilot = " ";
}
Slew_key_speed = (slew_slider->GetPos() * 0.5) + 0.5;
@@ -195,8 +200,7 @@ void CPreferencesDialog::OnOK() {
BOOL CPreferencesDialog::OnInitDialog() {
CDialog::OnInitDialog();
char **pilotlist;
int pilot_count;
std::vector<std::string> pilotlist;
// TODO: Add extra initialization here
CSliderCtrl *slew_slider = (CSliderCtrl *)GetDlgItem(IDC_SLEWSLIDER);
@@ -218,12 +222,12 @@ BOOL CPreferencesDialog::OnInitDialog() {
CComboBox *combo = (CComboBox *)GetDlgItem(IDC_DEFAULT_PILOT);
combo->ResetContent();
pilotlist = PltGetPilots(&pilot_count);
for (int i = 0; i < pilot_count; i++) {
combo->AddString(pilotlist[i]);
pilotlist = PltGetPilots();
for (auto const &pilot : pilotlist) {
combo->AddString(pilot.c_str());
}
if (pilot_count) {
combo->SelectString(-1, Default_pilot);
if (!pilotlist.empty()) {
combo->SelectString(-1, Default_pilot.c_str());
}
PltClearList();
@@ -232,8 +236,6 @@ BOOL CPreferencesDialog::OnInitDialog() {
else
DisableHardwareOptions();
PltGetPilotsFree();
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}