summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorChristian Klinger2016-05-20 14:26:31 +0200
committerChristian Klinger2016-05-20 14:26:31 +0200
commit0035d4e4984b64314142c97191e836b23b385de7 (patch)
tree8da37f87c1f0a58ae4b83d68a9ebaf2ee7922df4 /src/server
parentImplemented lock-button feature. (diff)
downloadpvs2-0035d4e4984b64314142c97191e836b23b385de7.tar.gz
pvs2-0035d4e4984b64314142c97191e836b23b385de7.tar.xz
pvs2-0035d4e4984b64314142c97191e836b23b385de7.zip
cleaned up some dead code.
Diffstat (limited to 'src/server')
-rw-r--r--src/server/mainwindow/mainwindow.cpp5
-rw-r--r--src/server/net/discoverylistener.cpp1
2 files changed, 0 insertions, 6 deletions
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index b76534e..76f5e00 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -187,9 +187,7 @@ float distance(QPoint a, QPoint b) {
*/
void MainWindow::placeFrameInFreeSlot(ConnectionFrame* frame, QPoint preferred)
{
- qDebug() << "placeFrameInFreeSlot(preferred = " << preferred << ")";
const QSize& clientSize = Global::getCurrentRoom()->clientSize;
- // TODO: Fix this qDebug() << "clientSize: " << &clientSize
/* Get occupied cell of each frame and store status in an array */
bool grid[_tilesX][_tilesY];
memset(grid, 0, sizeof(bool) * _tilesX * _tilesY); // set everything to false
@@ -550,9 +548,6 @@ void MainWindow::resizeEvent(QResizeEvent* e)
const Room* room = Global::getCurrentRoom();
const QSize& clientSize = room->clientSize;
- // TODO: Do I still need this?
- // if (room == NULL) {return; } /* Nothing to do here */
- // QSize& clientSize = room->clientSize;
if (ui->frmRoom->size().width() < 100 || ui->frmRoom->size().height() < 100 || _tilesX <= 0 || _tilesY <= 0) { return; }
QSize newGridSize = room->gridSize;
diff --git a/src/server/net/discoverylistener.cpp b/src/server/net/discoverylistener.cpp
index c0b80b8..e205c77 100644
--- a/src/server/net/discoverylistener.cpp
+++ b/src/server/net/discoverylistener.cpp
@@ -159,7 +159,6 @@ void DiscoveryListener::onReadyRead()
if (!Network::isAddressInList(QString::fromUtf8(iplist), addr.toString()))
continue;
// If so, check if the submitted hash seems valid
- // if (Global::getCurrentRoom() == "") { continue; } // TODO: Can we remove this check?
if (genSha1(&Global::sessionNameArray(), &salt1, &iplist) != hash &&
!(Global::getCurrentRoom()->clientPositions.contains(addr.toString())))
{