diff --git a/DXAudioOutput.cpp b/DXAudioOutput.cpp index c8bd94b2e..c0c767ec2 100644 --- a/DXAudioOutput.cpp +++ b/DXAudioOutput.cpp @@ -125,6 +125,8 @@ DXAudioOutputPlayer::DXAudioOutputPlayer(DXAudioOutput *ao, Player *player) : Au DXAudioOutputPlayer::~DXAudioOutputPlayer() { qWarning("DXAudioOutputPlayer: %s: Removed", p->qsName.toLatin1().constData()); + if (pDS3dBuffer) + pDS3dBuffer->Release(); if (pDSNotify) pDSNotify->Release(); if (pDSBOutput) { diff --git a/DXConfigDialog.cpp b/DXConfigDialog.cpp index 1a6a45aa6..03d00b95f 100644 --- a/DXConfigDialog.cpp +++ b/DXConfigDialog.cpp @@ -196,10 +196,10 @@ DXConfigDialog::DXConfigDialog(QWidget *p) : ConfigWidget(p) { grid->addWidget(qsMaxDistance, 2, 1); grid->addWidget(qlMaxDistance, 2, 2); - qsRollOff->setRange(lround(DS3D_MINROLLOFFFACTOR*10), lround(DS3D_MAXROLLOFFFACTOR *10)); + qsRollOff->setRange(0, 200); qsRollOff->setSingleStep(1); qsRollOff->setPageStep(10); - qsRollOff->setValue(lround(g.s.fDXRollOff * 10)); + qsRollOff->setValue(lround(g.s.fDXRollOff * 100)); qsRollOff->setObjectName("RollOff"); l = new QLabel(tr("RollOff")); l->setBuddy(qsRollOff); @@ -266,7 +266,7 @@ void DXConfigDialog::accept() { g.s.fDXMinDistance = qsMinDistance->value() / 10.0; g.s.fDXMaxDistance = qsMaxDistance->value() / 10.0; g.s.fDXDoppler = qsDoppler->value() / 10.0; - g.s.fDXRollOff = qsRollOff->value() / 10.0; + g.s.fDXRollOff = qsRollOff->value() / 100.0; } void DXConfigDialog::on_OutputDelay_valueChanged(int v) { @@ -292,14 +292,14 @@ void DXConfigDialog::on_Doppler_valueChanged(int v) { } void DXConfigDialog::on_RollOff_valueChanged(int v) { - qlRollOff->setText(tr("%1").arg(v/10.0, 0, 'f', 1)); + qlRollOff->setText(tr("%1").arg(v/100.0, 0, 'f', 2)); updateIntensity(); } void DXConfigDialog::updateIntensity() { float min = qsMinDistance->value() / 10.0; float max = qsMaxDistance->value() / 10.0; - float roll = qsRollOff->value() / 10.0; + float roll = qsRollOff->value() / 100.0; float intensity = min / (min + (max-min)*roll); qlIntensity->setText(tr("Players more than %1 meters away have %2% intensity").arg(max,0,'f',1).arg(intensity * 100.0, 0, 'f', 1)); diff --git a/MainWindow.cpp b/MainWindow.cpp index c465c3fe5..f20c7922c 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -182,6 +182,7 @@ void MainWindow::setupGui() { view->setDragEnabled(true); view->setDropIndicatorShown(true); view->setAcceptDrops(true); + view->setIndentation(10); qteLog = new QTextEdit(this); qteLog->setReadOnly(true); diff --git a/Plugins.cpp b/Plugins.cpp index 8a64072a0..2185de168 100644 --- a/Plugins.cpp +++ b/Plugins.cpp @@ -136,6 +136,7 @@ QIcon PluginConfig::icon() const { } void PluginConfig::accept() { + g.s.ptTransmit = static_cast(qcbTransmit->currentIndex()); } void PluginConfig::on_Config_clicked() { diff --git a/Server.cpp b/Server.cpp index a32a1a54f..af5495638 100644 --- a/Server.cpp +++ b/Server.cpp @@ -405,6 +405,8 @@ void MessageServerAuthenticate::process(Connection *cCon) { g_sServer->sendMessage(cCon, &mpm); } + // Legg til MOVE + MessageServerSync mssMsg; mssMsg.sPlayerId = pSrcPlayer->sId; mssMsg.qsWelcomeText = g_sp.qsWelcomeText; diff --git a/Settings.cpp b/Settings.cpp index a5ac78b7a..8ed804bdc 100644 --- a/Settings.cpp +++ b/Settings.cpp @@ -44,10 +44,10 @@ Settings::Settings() { iVoiceHold = 30; iJitterBufferSize = 8; iDXOutputDelay = 1; - fDXMinDistance = 5.0; - fDXMaxDistance = 35.0; + fDXMinDistance = 10.0; + fDXMaxDistance = 50.0; fDXDoppler = 0.0; - fDXRollOff = 0.5; + fDXRollOff = 0.15; } void Settings::load() {