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

Run clang-format on editor code

Browse Source
This commit is contained in:
Louis Gombert
2024-06-15 20:12:48 +02:00
parent 05d70f6322
commit 86cce1e445
289 changed files with 89405 additions and 97737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
editor/SoundSourceDialog.cpp
View File

@@ -1,20 +1,20 @@
/*
* Descent 3
* Copyright (C) 2024 Parallax Software
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* Descent 3
* Copyright (C) 2024 Parallax Software
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// SoundSourceDialog.cpp : implementation file
//
@@ -32,72 +32,64 @@ static char THIS_FILE[] = __FILE__;
/////////////////////////////////////////////////////////////////////////////
// CSoundSourceDialog dialog
CSoundSourceDialog::CSoundSourceDialog(soundsource_info_s *data, CWnd *pParent /*=NULL*/)
: CDialog(CSoundSourceDialog::IDD, pParent) {
//{{AFX_DATA_INIT(CSoundSourceDialog)
m_volume = 0.0f;
//}}AFX_DATA_INIT
CSoundSourceDialog::CSoundSourceDialog(soundsource_info_s *data,CWnd* pParent /*=NULL*/)
: CDialog(CSoundSourceDialog::IDD, pParent)
{
//{{AFX_DATA_INIT(CSoundSourceDialog)
m_volume = 0.0f;
//}}AFX_DATA_INIT
m_data_ptr = data;
m_volume = data->volume;
m_data_ptr = data;
m_volume = data->volume;
}
void CSoundSourceDialog::DoDataExchange(CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CSoundSourceDialog)
DDX_Control(pDX, IDC_SOUND_COMBO, m_sound_combo);
DDX_Text(pDX, IDC_VOLUME, m_volume);
DDV_MinMaxFloat(pDX, m_volume, 0.f, 1.f);
//}}AFX_DATA_MAP
void CSoundSourceDialog::DoDataExchange(CDataExchange *pDX) {
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CSoundSourceDialog)
DDX_Control(pDX, IDC_SOUND_COMBO, m_sound_combo);
DDX_Text(pDX, IDC_VOLUME, m_volume);
DDV_MinMaxFloat(pDX, m_volume, 0.f, 1.f);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CSoundSourceDialog, CDialog)
//{{AFX_MSG_MAP(CSoundSourceDialog)
ON_BN_CLICKED(IDC_SELECT, OnSelect)
//}}AFX_MSG_MAP
//{{AFX_MSG_MAP(CSoundSourceDialog)
ON_BN_CLICKED(IDC_SELECT, OnSelect)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CSoundSourceDialog message handlers
BOOL CSoundSourceDialog::OnInitDialog()
{
CDialog::OnInitDialog();
m_sound_combo.Init(m_data_ptr->sound_index);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
BOOL CSoundSourceDialog::OnInitDialog() {
CDialog::OnInitDialog();
m_sound_combo.Init(m_data_ptr->sound_index);
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
void CSoundSourceDialog::OnOK()
{
if (UpdateData(true)) {
m_data_ptr->volume = m_volume;
m_data_ptr->sound_index = m_sound_combo.GetSelected();
CDialog::OnOK();
}
void CSoundSourceDialog::OnOK() {
if (UpdateData(true)) {
m_data_ptr->volume = m_volume;
m_data_ptr->sound_index = m_sound_combo.GetSelected();
CDialog::OnOK();
}
}
#include "soundload.h"
#include "DallasSoundDlg.h"
void CSoundSourceDialog::OnSelect()
{
CDallasSoundDlg dlg;
void CSoundSourceDialog::OnSelect() {
CDallasSoundDlg dlg;
int selected = m_sound_combo.GetSelected();
if (selected != -1)
dlg.m_SoundName = Sounds[selected].name;
int selected = m_sound_combo.GetSelected();
if (selected != -1)
dlg.m_SoundName = Sounds[selected].name;
if (dlg.DoModal() == IDCANCEL)
return;
if (dlg.DoModal() == IDCANCEL)
return;
m_sound_combo.SetSelected(dlg.m_SoundIndex);
m_sound_combo.SetSelected(dlg.m_SoundIndex);
}