Browse Source

Removed unused variables

Build fixes for a higher warning level
Robert H 11 years ago
parent
commit
67868d8b40

+ 1 - 0
oxygine/greenlets/src/platform/switch_x86_msvc.h

@@ -35,6 +35,7 @@
    register 'ebp' modified by inline assembly code */
    register 'ebp' modified by inline assembly code */
 #pragma optimize("g", off)
 #pragma optimize("g", off)
 #pragma warning(disable:4731)
 #pragma warning(disable:4731)
+#pragma warning(disable:4733)
 
 
 static int
 static int
 slp_switch(void)
 slp_switch(void)

+ 0 - 1
oxygine/src/Actor.cpp

@@ -886,7 +886,6 @@ namespace oxygine
 		{
 		{
 			spTween tweenNext = tween->getNextSibling();
 			spTween tweenNext = tween->getNextSibling();
 
 
-			bool done = false;
 			if (tween->getParentList())
 			if (tween->getParentList())
 				tween->update(*this, us);
 				tween->update(*this, us);
 			if (tween->isDone() && tween->getParentList())
 			if (tween->isDone() && tween->getParentList())

+ 1 - 1
oxygine/src/Button.cpp

@@ -43,7 +43,7 @@ namespace oxygine
 	void Button::_mouseEvent(Event *event)
 	void Button::_mouseEvent(Event *event)
 	{
 	{
 		TouchEvent *me = safeCast<TouchEvent*>(event);
 		TouchEvent *me = safeCast<TouchEvent*>(event);
-		Actor *act = safeCast<Actor*>(event->target.get());
+		//Actor *act = safeCast<Actor*>(event->target.get());
 
 
 		switch(event->type)
 		switch(event->type)
 		{
 		{

+ 1 - 1
oxygine/src/DebugActor.cpp

@@ -155,7 +155,7 @@ namespace oxygine
 		va_list args;
 		va_list args;
 		va_start(args, format);
 		va_start(args, format);
 		int len = (int)strlen(buff);
 		int len = (int)strlen(buff);
-		int i = vsnprintf(buff + len, sizeof(buff) - len, format, args);
+		vsnprintf(buff + len, sizeof(buff) - len, format, args);
 		va_end(args);
 		va_end(args);
 
 
 		_debugText += buff;
 		_debugText += buff;

+ 2 - 2
oxygine/src/InputText.cpp

@@ -153,8 +153,8 @@ namespace oxygine
 		{
 		{
 		case SDL_TEXTEDITING:
 		case SDL_TEXTEDITING:
 			{
 			{
-				SDL_TextEditingEvent &te = event->edit;
-				int q=0;
+				//SDL_TextEditingEvent &te = event->edit;
+				//int q=0;
 			}
 			}
 			break;
 			break;
 		case SDL_TEXTINPUT:
 		case SDL_TEXTINPUT:

+ 0 - 2
oxygine/src/MemoryTexture.cpp

@@ -104,9 +104,7 @@ namespace oxygine
 			//printf("jpeg is fully off screen\n");
 			//printf("jpeg is fully off screen\n");
 			return bRet;
 			return bRet;
 		}
 		}
-		int startx = 0;
 		int starty = 0;
 		int starty = 0;
-		int bytesPerPix = 4;
 
 
 		TextureFormat destFormat = format;
 		TextureFormat destFormat = format;
 		if (destFormat == TF_UNDEFINED)
 		if (destFormat == TF_UNDEFINED)

+ 0 - 2
oxygine/src/ProgressBar.cpp

@@ -128,8 +128,6 @@ namespace oxygine
 			const Vector2 &size = destRect.size;
 			const Vector2 &size = destRect.size;
 			pos += size / 2.f;				
 			pos += size / 2.f;				
 
 
-			float maxSide = std::max( size.x, size.y );
-
 			Vector2 vecCenter( pos.x, pos.y );
 			Vector2 vecCenter( pos.x, pos.y );
 			Vector2 vdiag = Vector2( pos.x + size.x / 2.f, pos.y - size.y / 2.f ) - vecCenter;
 			Vector2 vdiag = Vector2( pos.x + size.x / 2.f, pos.y - size.y / 2.f ) - vecCenter;
 			Vector2 vdiag2 = Vector2( pos.x + size.x / 2.f, pos.y + size.y / 2.f ) - vecCenter;
 			Vector2 vdiag2 = Vector2( pos.x + size.x / 2.f, pos.y + size.y / 2.f ) - vecCenter;

+ 1 - 1
oxygine/src/core/ZipFileSystem.cpp

@@ -278,7 +278,7 @@ namespace file
 		unsigned int getSize() const
 		unsigned int getSize() const
 		{
 		{
 			unz_file_info file_info;
 			unz_file_info file_info;
-			int res = unzGetCurrentFileInfo(_entry->zp, &file_info, 0, 0, 0, 0, 0, 0);
+			unzGetCurrentFileInfo(_entry->zp, &file_info, 0, 0, 0, 0, 0, 0);
 			return file_info.uncompressed_size;
 			return file_info.uncompressed_size;
 		}
 		}
 
 

+ 1 - 2
oxygine/src/core/gl/ShaderProgramGL.cpp

@@ -30,8 +30,7 @@ namespace oxygine
 	int ShaderProgramGL::getUniformLocation(const char *id) const
 	int ShaderProgramGL::getUniformLocation(const char *id) const
 	{
 	{
 		int i = glGetUniformLocation(_program, id);
 		int i = glGetUniformLocation(_program, id);
-		if (i == -1)
-			int q=0;
+		//if (i == -1)
 		CHECKGL();
 		CHECKGL();
 		return i;
 		return i;
 	}
 	}

+ 0 - 1
oxygine/src/dev_tools/TexturesInspector.cpp

@@ -105,7 +105,6 @@ namespace oxygine
 		
 		
 		int numX = (int)(size.x / itemSize.x);
 		int numX = (int)(size.x / itemSize.x);
 
 
-		float y = 0;
 		int n = 0;
 		int n = 0;
 		int mem = 0;
 		int mem = 0;
 		for (vector<spNativeTexture>::iterator i = textures.begin(); i != textures.end(); ++i)
 		for (vector<spNativeTexture>::iterator i = textures.begin(); i != textures.end(); ++i)

+ 0 - 4
oxygine/src/res/ResAtlas.cpp

@@ -177,9 +177,6 @@ namespace oxygine
 				{
 				{
 					OX_ASSERT(meta_frames && "Did you recreate atlasses?");
 					OX_ASSERT(meta_frames && "Did you recreate atlasses?");
 				}
 				}
-
-								
-				int virtual_frame_width = 0;
 				
 				
 				MemoryTexture mt;
 				MemoryTexture mt;
 				ImageData im;
 				ImageData im;
@@ -263,7 +260,6 @@ namespace oxygine
 						char *frames_data = (char*)meta_frames.first_child().value();
 						char *frames_data = (char*)meta_frames.first_child().value();
 
 
 						const char *begin = frames_data;
 						const char *begin = frames_data;
-						int i = 0;
 						while(*frames_data)
 						while(*frames_data)
 						{
 						{
 							if (*frames_data == ';')
 							if (*frames_data == ';')

+ 0 - 2
oxygine/src/res/Resources.cpp

@@ -238,8 +238,6 @@ namespace oxygine
 		pugi::xml_node resources_meta = doc_meta.first_child();
 		pugi::xml_node resources_meta = doc_meta.first_child();
 
 
 
 
-		int i = 0;
-
 		string id;
 		string id;
 		//string file;
 		//string file;
 		string rect_str;
 		string rect_str;

+ 0 - 5
oxygine/src/text_utils/Aligner.cpp

@@ -102,9 +102,6 @@ namespace oxygine
 		{
 		{
 			if (!ln.empty())
 			if (!ln.empty())
 			{
 			{
-				Symbol &first = *ln.front();
-				Symbol &last = *ln.back();
-
 				//calculate real text width
 				//calculate real text width
 				int rx = 0;
 				int rx = 0;
 				for (size_t i = 0; i < ln.size(); ++i)
 				for (size_t i = 0; i < ln.size(); ++i)
@@ -115,8 +112,6 @@ namespace oxygine
 
 
 				int tx = _alignX(rx);
 				int tx = _alignX(rx);
 
 
-				int qx = 0;///_alignX(0) - _alignX(rx);
-
 				for (size_t i = 0; i < ln.size(); ++i)
 				for (size_t i = 0; i < ln.size(); ++i)
 				{
 				{
 					Symbol &s = *ln[i];
 					Symbol &s = *ln[i];

+ 0 - 4
oxygine/src/text_utils/Node.cpp

@@ -53,10 +53,6 @@ namespace oxygine
 
 
 		void Node::finalPass(Aligner &rd)
 		void Node::finalPass(Aligner &rd)
 		{
 		{
-			float scaleFactor = rd.getScaleFactor();
-
-			int offsetY = rd.bounds.pos.y;
-
 			_finalPass(rd);
 			_finalPass(rd);
 
 
 			Node *child = _firstChild;
 			Node *child = _firstChild;

+ 0 - 5
oxygine/src/utils/stringUtils.cpp

@@ -133,8 +133,6 @@ namespace oxygine
 		{			
 		{			
 			OX_ASSERT(src != dest);
 			OX_ASSERT(src != dest);
 
 
-			const char *destcopy = dest;
-			//const char *srccopy = src;
 			if (*src == '/' || *src == '\\')
 			if (*src == '/' || *src == '\\')
 			{
 			{
 				*dest = '/';
 				*dest = '/';
@@ -143,8 +141,6 @@ namespace oxygine
 			}		
 			}		
 			char *copy = dest;
 			char *copy = dest;
 
 
-			char last = 0;		
-
 			*dest = 0;
 			*dest = 0;
 			while(*src)
 			while(*src)
 			{
 			{
@@ -193,7 +189,6 @@ namespace oxygine
 				
 				
 			}
 			}
 			*dest = 0;
 			*dest = 0;
-			int q=0;
 		}
 		}
 	}
 	}