[prev in list] [next in list] [prev in thread] [next in thread]
List: bzflag-commits
Subject: SF.net SVN: bzflag:[22193] trunk/bzflag/src/bzflag/playing.cxx
From: atupone () users ! sourceforge ! net
Date: 2011-10-28 15:53:55
Message-ID: E1RJokl-0007SP-Om () sfp-svn-2 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 22193
http://bzflag.svn.sourceforge.net/bzflag/?rev=22193&view=rev
Author: atupone
Date: 2011-10-28 15:53:55 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
(performance) Possible inefficient checking for emptiness.
(performance) Function parameter 'note' should be passed by reference.
(style) The scope of the variable 'i', 'heartbeatTime' and 'e' can be reduced
(performance) Prefer prefix ++/-- operators for non-primitive types.
(style) The function 'inLockRange' is never used
Modified Paths:
--------------
trunk/bzflag/src/bzflag/playing.cxx
Modified: trunk/bzflag/src/bzflag/playing.cxx
===================================================================
--- trunk/bzflag/src/bzflag/playing.cxx 2011-10-28 12:17:54 UTC (rev 22192)
+++ trunk/bzflag/src/bzflag/playing.cxx 2011-10-28 15:53:55 UTC (rev 22193)
@@ -297,7 +297,7 @@
showFlagsMsg += "Flags on field hidden, to show them ";
std::vector<std::string> keys = KEYMGR.getKeysFromCommand("toggleFlags main", \
true);
- if (keys.size() != 0) {
+ if (not keys.empty()) {
showFlagsMsg += "hit \"" + ColorStrings[WhiteColor];
showFlagsMsg += tolower(keys[0][0]);
showFlagsMsg += ColorStrings[YellowColor] + "\"";
@@ -315,12 +315,12 @@
showFlagsMsg += "Flags on radar hidden, to show them ";
std::vector<std::string> keys = KEYMGR.getKeysFromCommand("toggleFlags radar", \
true);
- if (keys.size() != 0) {
+ if (keys.empty()) {
+ showFlagsMsg += " bind a key to Toggle Flags on Radar";
+ } else {
showFlagsMsg += "hit \"" + ColorStrings[WhiteColor];
showFlagsMsg += tolower(keys[0][0]);
showFlagsMsg += ColorStrings[YellowColor] + "\"";
- } else {
- showFlagsMsg += " bind a key to Toggle Flags on Radar";
}
addMessage(NULL, showFlagsMsg);
}
@@ -333,12 +333,12 @@
message += "To toggle the radar ";
std::vector<std::string> keys = KEYMGR.getKeysFromCommand("toggleRadar", true);
- if (keys.size() != 0) {
+ if (keys.empty()) {
+ message += " bind a key to Toggle Radar";
+ } else {
message += "hit \"" + ColorStrings[WhiteColor];
message += keys[0];
message += ColorStrings[YellowColor] + "\"";
- } else {
- message += " bind a key to Toggle Radar";
}
addMessage(NULL, message);
@@ -352,12 +352,12 @@
message += "To toggle the console ";
std::vector<std::string> keys = KEYMGR.getKeysFromCommand("toggleConsole", \
true);
- if (keys.size() != 0) {
+ if (keys.empty()) {
+ message += " bind a key to Toggle Console";
+ } else {
message += "hit \"" + ColorStrings[WhiteColor];
message += keys[0];
message += ColorStrings[YellowColor] + "\"";
- } else {
- message += " bind a key to Toggle Console";
}
// can't use a console message for this one
@@ -464,7 +464,7 @@
playingCallbacks.erase(it);
break;
}
- it++;
+ ++it;
}
}
@@ -1254,10 +1254,10 @@
std::string restartLabel = "Right Mouse";
std::vector<std::string> keys = KEYMGR.getKeysFromCommand("restart", false);
- if (keys.size() == 0) {
+ if (keys.empty()) {
// found nothing on down binding, so try up
keys = KEYMGR.getKeysFromCommand("identify", true);
- if (keys.size() == 0) {
+ if (keys.empty()) {
std::cerr << "There does not appear to be any key bound to enter the game" << \
std::endl; }
}
@@ -1386,7 +1386,7 @@
static void printIpInfo (const Player *_player, const Address& addr,
- const std::string note)
+ const std::string ¬e)
{
if (_player == NULL) {
return;
@@ -3125,10 +3125,10 @@
{
char msg[MaxPacketLen];
uint16_t code, len;
- int e = 0;
// handle server messages
if (serverLink) {
+ int e = 0;
while (!serverError && (e = serverLink->read(code, len, msg, 0)) == 1)
handleServerMessage(true, code, len, msg);
if (e == -2) {
@@ -3171,7 +3171,8 @@
float size, float duration, bool grounded)
{
// ignore if no prototypes available;
- if (prototypeExplosions.size() == 0) return false;
+ if (prototypeExplosions.empty())
+ return false;
// don't show explosions if quality is low
if (sceneRenderer->useQuality() < 1) return false;
@@ -3297,7 +3298,8 @@
if (explosions[i]->isAtEnd()) {
delete explosions[i];
std::vector<BillboardSceneNode*>::iterator it = explosions.begin();
- for(int j = 0; j < i; j++) it++;
+ for (int j = 0; j < i; j++)
+ ++it;
explosions.erase(it);
}
}
@@ -3734,24 +3736,6 @@
}
}
-
-
-bool inLockRange(float angle, float distance, float bestDistance, RemotePlayer \
*player)
-{
- if (player->isPaused() || player->isNotResponding() ||
- player->getFlag() == Flags::Stealth)
- return false; // can't lock to paused, NR, or stealth
-
- if (angle >= BZDB.eval(StateDatabase::BZDB_LOCKONANGLE))
- return false;
-
- if (distance >= bestDistance)
- return false;
-
- return true;
-}
-
-
bool inLookRange(float angle, float distance, float bestDistance, RemotePlayer \
*player) {
// usually about 17 degrees
@@ -4732,9 +4716,9 @@
* the abbreviations for all the flags we support.
*/
for (i = FlagType::getFlagMap().begin();
- i != FlagType::getFlagMap().end(); i++) {
+ i != FlagType::getFlagMap().end();
+ ++i)
buf = (char*) i->second->pack(buf);
- }
serverLink->send(MsgNegotiateFlags, buf - msg, msg);
}
@@ -5373,7 +5357,6 @@
GLfloat fov;
GLfloat eyePoint[3];
GLfloat targetPoint[3];
- int i;
checkDirtyControlPanel(controlPanel);
@@ -5546,6 +5529,7 @@
SceneDatabase* scene = sceneRenderer->getSceneDatabase();
if (scene && myTank) {
+ int i;
const bool seerView = (myTank->getFlag() == Flags::Seer);
const bool showTreads = BZDB.isTrue("showTreads");
@@ -6600,21 +6584,20 @@
updateSound();
- double heartbeatTime = 30.0f;
bool sendUpdate = myTank && myTank->isDeadReckoningWrong();
if (myTank && myTank->getTeam() == ObserverTeam) {
if (BZDB.isTrue("sendObserverHeartbeat")) {
- if (BZDB.isSet("observerHeartbeat"))
- heartbeatTime = BZDB.eval("observerHeartbeat");
+ double heartbeatTime = BZDB.isSet("observerHeartbeat")
+ ? BZDB.eval("observerHeartbeat") : 30.0f;
if (lastObserverUpdateTime + heartbeatTime < TimeKeeper::getTick().getSeconds()) {
lastObserverUpdateTime = TimeKeeper::getTick().getSeconds();
sendUpdate = true;
- }
- else
+ } else {
sendUpdate = false;
- }
- else
+ }
+ } else {
sendUpdate = false;
+ }
}
// send my data
if ( sendUpdate) {
@@ -6662,10 +6645,10 @@
// Instead of sleeping try to handle network packets
char msg[MaxPacketLen];
uint16_t code, len;
- int e = 0;
// handle server messages
if (serverLink && !serverError) {
+ int e = 0;
e = serverLink->read(code, len, msg, int(remaining * 1000.0f));
if (e == 1)
handleServerMessage(true, code, len, msg);
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
BZFlag-commits mailing list
BZFlag-commits@lists.SourceForge.net
https://lists.SourceForge.net/lists/listinfo/bzflag-commits
irc: #BZFlag @ irc.freenode.net
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic