Browse Source

playercount back, message "none" when there are no lastmsgs.

Mihawk 11 years ago
parent
commit
7a45750be3
1 changed files with 10 additions and 2 deletions
  1. 10 2
      Client.cpp

+ 10 - 2
Client.cpp

@@ -211,7 +211,7 @@ void Client::parsePrintedLine()
       mySpamBroadcastFloodTime = currentTime.addSecs(Settings::globalInstance()->spamFloodProtTime());
     }
 
-    QString server(QString(host()) + ":" + QString::number(port())/* + " " + QString::number(playerCount()) + "/" + QString::number(myMaxClients)*/);
+    QString server(QString(host()) + ":" + QString::number(port()) + " " + QString::number(playerCount()) + "/" + QString::number(myMaxClients));
     QString message("-" + command + "- " + nick + " - " + server + " : " + args.trimmed());
 
     /* Broadcast within QW servers */
@@ -259,9 +259,16 @@ void Client::parsePrintedLine()
 
   if(command == "lastmsgs")
   {
+    QStringList messages = myApp->lastMessages();
+    if(!messages.size())
+    {
+      say("None");
+      return;
+    }
+
     QString msg;
     int i = 0;
-    foreach(msg, myApp->lastMessages())
+    foreach(msg, messages)
     {
       if(++i > 5)
         break;
@@ -378,6 +385,7 @@ void Client::run()
 
   /* Avoid wrap around of flood timers */
   QTime currentTime = QTime::currentTime();
+  qDebug() << currentTime.secsTo(myEndFloodTime);
 
   if(currentTime.secsTo(myEndFloodTime) < -16000)
     myEndFloodTime = currentTime;