|
From: <bul...@us...> - 2013-06-09 04:53:11
|
Revision: 22802
http://sourceforge.net/p/bzflag/code/22802
Author: bullet_catcher
Date: 2013-06-09 04:53:08 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
Remove unused class private variables revealed by the LLVM compiler's -Wunused-private-field option.
Modified Paths:
--------------
trunk/bzflag/include/TankSceneNode.h
trunk/bzflag/src/bzflag/FormatMenu.h
trunk/bzflag/src/bzflag/MainMenu.cxx
trunk/bzflag/src/bzflag/MainMenu.h
trunk/bzflag/src/bzflag/Plan.cxx
trunk/bzflag/src/bzflag/Plan.h
trunk/bzflag/src/bzflag/ScoreboardRenderer.cxx
trunk/bzflag/src/bzflag/ScoreboardRenderer.h
trunk/bzflag/src/bzflag/SegmentedShotStrategy.cxx
trunk/bzflag/src/bzflag/SegmentedShotStrategy.h
trunk/bzflag/src/bzflag/ServerCommandKey.cxx
trunk/bzflag/src/bzflag/ServerCommandKey.h
trunk/bzflag/src/bzflag/effectsRenderer.cxx
trunk/bzflag/src/bzfs/ListServerConnection.cxx
trunk/bzflag/src/bzfs/ListServerConnection.h
trunk/bzflag/src/geometry/TankSceneNode.cxx
trunk/bzflag/src/platform/SDLDisplay.cxx
trunk/bzflag/src/platform/SDLDisplay.h
Modified: trunk/bzflag/include/TankSceneNode.h
===================================================================
--- trunk/bzflag/include/TankSceneNode.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/include/TankSceneNode.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -200,14 +200,11 @@
float leftWheelOffset;
float rightWheelOffset;
bool useDimensions;
- bool useOverride;
bool onlyShadows;
bool transparent, sort;
- float spawnFraction;
float explodeFraction;
bool clip;
bool inTheCockpit;
- GLfloat colorOverride[4];
GLfloat color[4];
GLdouble clipPlane[4];
OpenGLGState gstate;
@@ -242,4 +239,3 @@
// indent-tabs-mode: t ***
// End: ***
// ex: shiftwidth=2 tabstop=8
-
Modified: trunk/bzflag/src/bzflag/FormatMenu.h
===================================================================
--- trunk/bzflag/src/bzflag/FormatMenu.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/FormatMenu.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -61,7 +61,6 @@
private:
FormatMenuDefaultKey defaultKey;
int numFormats;
- float center;
HUDuiLabel* currentLabel;
HUDuiLabel* pageLabel;
Modified: trunk/bzflag/src/bzflag/MainMenu.cxx
===================================================================
--- trunk/bzflag/src/bzflag/MainMenu.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/MainMenu.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -32,7 +32,7 @@
#include "HUDui.h"
MainMenu::MainMenu() : HUDDialog(),
- join(), login(), options(), help(), leave(), save(), quit(),
+ join(), options(), help(), leave(), save(), quit(),
joinMenu(NULL), optionsMenu(NULL), quitMenu(NULL)
{
}
@@ -207,4 +207,3 @@
// indent-tabs-mode: t ***
// End: ***
// ex: shiftwidth=2 tabstop=8
-
Modified: trunk/bzflag/src/bzflag/MainMenu.h
===================================================================
--- trunk/bzflag/src/bzflag/MainMenu.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/MainMenu.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -42,7 +42,6 @@
HUDuiControl* createLabel(const char* string);
HUDuiControl* join;
- HUDuiControl* login;
HUDuiControl* options;
HUDuiControl* help;
HUDuiControl* leave;
Modified: trunk/bzflag/src/bzflag/Plan.cxx
===================================================================
--- trunk/bzflag/src/bzflag/Plan.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/Plan.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -484,7 +484,7 @@
* HuntTeamFlagPlan
*/
-HuntTeamFlagPlan::HuntTeamFlagPlan() : Plan(300.0f), flagID()
+HuntTeamFlagPlan::HuntTeamFlagPlan() : Plan(300.0f)
{
}
@@ -527,3 +527,10 @@
return NULL;
}
+// Local Variables: ***
+// mode:C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: trunk/bzflag/src/bzflag/Plan.h
===================================================================
--- trunk/bzflag/src/bzflag/Plan.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/Plan.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -156,8 +156,6 @@
virtual bool isValid();
virtual bool usesSubPlan();
virtual Plan *createSubPlan();
-private:
- int flagID;
};
class CaptureFlagPlan : public Plan
@@ -179,4 +177,3 @@
// indent-tabs-mode: t ***
// End: ***
// ex: shiftwidth=2 tabstop=8
-
Modified: trunk/bzflag/src/bzflag/ScoreboardRenderer.cxx
===================================================================
--- trunk/bzflag/src/bzflag/ScoreboardRenderer.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/ScoreboardRenderer.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -63,7 +63,6 @@
winWidth (0.0),
winHeight(),
dim(false),
- huntIndicator(false),
huntPosition(0),
huntSelectEvent(false),
huntPositionEvent(0),
Modified: trunk/bzflag/src/bzflag/ScoreboardRenderer.h
===================================================================
--- trunk/bzflag/src/bzflag/ScoreboardRenderer.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/ScoreboardRenderer.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -103,7 +103,6 @@
float winHeight;
bool dim;
- bool huntIndicator;
int huntPosition;
bool huntSelectEvent;
int huntPositionEvent;
Modified: trunk/bzflag/src/bzflag/SegmentedShotStrategy.cxx
===================================================================
--- trunk/bzflag/src/bzflag/SegmentedShotStrategy.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/SegmentedShotStrategy.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -31,7 +31,7 @@
#include "playing.h"
SegmentedShotStrategy::SegmentedShotStrategy(ShotPath* _path, bool useSuperTexture, bool faint) :
- ShotStrategy(_path), bbox(), firstSegment()
+ ShotStrategy(_path), bbox()
{
// initialize times
prevTime = getPath().getStartTime();
Modified: trunk/bzflag/src/bzflag/SegmentedShotStrategy.h
===================================================================
--- trunk/bzflag/src/bzflag/SegmentedShotStrategy.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/SegmentedShotStrategy.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -66,7 +66,6 @@
std::vector<ShotPathSegment> segments;
BoltSceneNode* boltSceneNode;
float bbox[2][3];
- int firstSegment;
};
class NormalShotStrategy : public SegmentedShotStrategy {
Modified: trunk/bzflag/src/bzflag/ServerCommandKey.cxx
===================================================================
--- trunk/bzflag/src/bzflag/ServerCommandKey.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/ServerCommandKey.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -26,7 +26,7 @@
/* FIXME - note the important numModes and numNonAdminModes values inited here
* when new commands are added, the indices need to be adjusted here.
*/
-ServerCommandKey::ServerCommandKey(): mode(LagStats), startIndex(-1), numModes(35), numNonAdminModes(6)
+ServerCommandKey::ServerCommandKey(): mode(LagStats), numModes(35), numNonAdminModes(6)
{
return;
}
@@ -422,3 +422,11 @@
}
return keyPress(key);
}
+
+// Local Variables: ***
+// mode:C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: trunk/bzflag/src/bzflag/ServerCommandKey.h
===================================================================
--- trunk/bzflag/src/bzflag/ServerCommandKey.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/ServerCommandKey.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -69,12 +69,9 @@
};
Mode mode;
- int startIndex;
const int numModes;
const int numNonAdminModes;
static const Mode nonAdminModes[6];
-
-
};
#endif
@@ -86,4 +83,3 @@
// indent-tabs-mode: t ***
// End: ***
// ex: shiftwidth=2 tabstop=8
-
Modified: trunk/bzflag/src/bzflag/effectsRenderer.cxx
===================================================================
--- trunk/bzflag/src/bzflag/effectsRenderer.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzflag/effectsRenderer.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -58,7 +58,6 @@
float maxZ;
float ringRange;
- float numRings;
};
class StdShotEffect : public BasicEffect
@@ -819,7 +818,7 @@
//******************RingSpawnEffect****************
-RingSpawnEffect::RingSpawnEffect(): ringRange(), numRings()
+RingSpawnEffect::RingSpawnEffect(): ringRange()
{
radius = 4.0f;
maxZ = 10.0f;
@@ -1879,4 +1878,3 @@
// indent-tabs-mode: t ***
// End: ***
// ex: shiftwidth=2 tabstop=8
-
Modified: trunk/bzflag/src/bzfs/ListServerConnection.cxx
===================================================================
--- trunk/bzflag/src/bzfs/ListServerConnection.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzfs/ListServerConnection.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -65,7 +65,7 @@
queueMessage(ListServerLink::ADD);
}
-ListServerLink::ListServerLink(): nextMessageType(), port(0), queuedRequest(0)
+ListServerLink::ListServerLink(): nextMessageType(), queuedRequest(0)
{
// does not create a usable link, so checks should be placed
// in all public member functions to ensure that nothing tries
Modified: trunk/bzflag/src/bzfs/ListServerConnection.h
===================================================================
--- trunk/bzflag/src/bzfs/ListServerConnection.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/bzfs/ListServerConnection.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -49,7 +49,6 @@
// list server information
Address address;
- int port;
std::string hostname;
std::string pathname;
Modified: trunk/bzflag/src/geometry/TankSceneNode.cxx
===================================================================
--- trunk/bzflag/src/geometry/TankSceneNode.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/geometry/TankSceneNode.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -47,10 +47,9 @@
TankSceneNode::TankSceneNode(const GLfloat pos[3], const GLfloat forward[3]) :
leftTreadOffset(0.0f), rightTreadOffset(0.0f),
leftWheelOffset(0.0f), rightWheelOffset(0.0f),
- useDimensions(false), useOverride(false),
- onlyShadows(false), clip(false),
- inTheCockpit(false), tankRenderNode(this), treadsRenderNode(this),
- shadowRenderNode(this),
+ useDimensions(false), onlyShadows(false),
+ clip(false), inTheCockpit(false), tankRenderNode(this),
+ treadsRenderNode(this), shadowRenderNode(this),
tankSize(TankGeometryEnums::Normal)
{
// setup style factors (BZDB isn't set up at global init time
Modified: trunk/bzflag/src/platform/SDLDisplay.cxx
===================================================================
--- trunk/bzflag/src/platform/SDLDisplay.cxx 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/platform/SDLDisplay.cxx 2013-06-09 04:53:08 UTC (rev 22802)
@@ -601,7 +601,7 @@
}
SDLWindow::SDLWindow(const SDLDisplay* _display, SDLVisual*)
- : BzfWindow(_display), x(-1), y(-1), hasGamma(true)
+ : BzfWindow(_display), hasGamma(true)
{
}
Modified: trunk/bzflag/src/platform/SDLDisplay.h
===================================================================
--- trunk/bzflag/src/platform/SDLDisplay.h 2013-06-09 03:53:58 UTC (rev 22801)
+++ trunk/bzflag/src/platform/SDLDisplay.h 2013-06-09 04:53:08 UTC (rev 22802)
@@ -102,8 +102,6 @@
void freeContext() {;};
bool create(void);
private:
- int x;
- int y;
bool hasGamma;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|