Build fixes for a higher warning level
@@ -35,6 +35,7 @@
register 'ebp' modified by inline assembly code */
#pragma optimize("g", off)
#pragma warning(disable:4731)
+#pragma warning(disable:4733)
static int
slp_switch(void)
@@ -886,7 +886,6 @@ namespace oxygine
{
spTween tweenNext = tween->getNextSibling();
- bool done = false;
if (tween->getParentList())
tween->update(*this, us);
if (tween->isDone() && tween->getParentList())
@@ -43,7 +43,7 @@ namespace oxygine
void Button::_mouseEvent(Event *event)
TouchEvent *me = safeCast<TouchEvent*>(event);
- Actor *act = safeCast<Actor*>(event->target.get());
+ //Actor *act = safeCast<Actor*>(event->target.get());
switch(event->type)
@@ -155,7 +155,7 @@ namespace oxygine
va_list args;
va_start(args, format);
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);
_debugText += buff;
@@ -153,8 +153,8 @@ namespace oxygine
case SDL_TEXTEDITING:
- SDL_TextEditingEvent &te = event->edit;
- int q=0;
+ //SDL_TextEditingEvent &te = event->edit;
+ //int q=0;
}
break;
case SDL_TEXTINPUT:
@@ -104,9 +104,7 @@ namespace oxygine
//printf("jpeg is fully off screen\n");
return bRet;
- int startx = 0;
int starty = 0;
- int bytesPerPix = 4;
TextureFormat destFormat = format;
if (destFormat == TF_UNDEFINED)
@@ -128,8 +128,6 @@ namespace oxygine
const Vector2 &size = destRect.size;
pos += size / 2.f;
- float maxSide = std::max( size.x, size.y );
-
Vector2 vecCenter( pos.x, pos.y );
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;
@@ -278,7 +278,7 @@ namespace file
unsigned int getSize() const
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;
@@ -30,8 +30,7 @@ namespace oxygine
int ShaderProgramGL::getUniformLocation(const char *id) const
int i = glGetUniformLocation(_program, id);
- if (i == -1)
+ //if (i == -1)
CHECKGL();
return i;
@@ -105,7 +105,6 @@ namespace oxygine
int numX = (int)(size.x / itemSize.x);
- float y = 0;
int n = 0;
int mem = 0;
for (vector<spNativeTexture>::iterator i = textures.begin(); i != textures.end(); ++i)
@@ -177,9 +177,6 @@ namespace oxygine
OX_ASSERT(meta_frames && "Did you recreate atlasses?");
- int virtual_frame_width = 0;
MemoryTexture mt;
ImageData im;
@@ -263,7 +260,6 @@ namespace oxygine
char *frames_data = (char*)meta_frames.first_child().value();
const char *begin = frames_data;
- int i = 0;
while(*frames_data)
if (*frames_data == ';')
@@ -238,8 +238,6 @@ namespace oxygine
pugi::xml_node resources_meta = doc_meta.first_child();
string id;
//string file;
string rect_str;
@@ -102,9 +102,6 @@ namespace oxygine
if (!ln.empty())
- Symbol &first = *ln.front();
- Symbol &last = *ln.back();
//calculate real text width
int rx = 0;
for (size_t i = 0; i < ln.size(); ++i)
@@ -115,8 +112,6 @@ namespace oxygine
int tx = _alignX(rx);
- int qx = 0;///_alignX(0) - _alignX(rx);
Symbol &s = *ln[i];
@@ -53,10 +53,6 @@ namespace oxygine
void Node::finalPass(Aligner &rd)
- float scaleFactor = rd.getScaleFactor();
- int offsetY = rd.bounds.pos.y;
_finalPass(rd);
Node *child = _firstChild;
@@ -133,8 +133,6 @@ namespace oxygine
OX_ASSERT(src != dest);
- const char *destcopy = dest;
- //const char *srccopy = src;
if (*src == '/' || *src == '\\')
*dest = '/';
@@ -143,8 +141,6 @@ namespace oxygine
char *copy = dest;
- char last = 0;
*dest = 0;
while(*src)
@@ -193,7 +189,6 @@ namespace oxygine