fixed compiler warnings
This commit is contained in:
+1
-1
@@ -186,7 +186,7 @@ void CommandSetErrorString (const std::string &error_str){
|
||||
|
||||
std::string CommandGetErrorString (){
|
||||
if (!CommandsInitialized ())
|
||||
return false;
|
||||
return std::string("");
|
||||
|
||||
return CommandsInstance->GetErrorString();
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ bool regionhit (int x, int y, int w, int h) {
|
||||
|
||||
void DrawBlock (int x, int y, int w, int h) {
|
||||
const float shading_dark = 0.5f;
|
||||
const float shading_light = 1.3f;
|
||||
// const float shading_light = 1.3f;
|
||||
|
||||
float color[4];
|
||||
glGetFloatv (GL_CURRENT_COLOR, color);
|
||||
@@ -297,6 +297,8 @@ bool Button (int id, const char* caption, int x, int y, int w, int h) {
|
||||
controller->uistate.kbditem = 0;
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -418,6 +420,8 @@ bool CheckButton (int id, const char* caption, bool checked, int x, int y, int w
|
||||
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -541,7 +545,7 @@ bool LineEdit (int id, int x, int y, std::string &text_value, const int &maxleng
|
||||
break;
|
||||
default:
|
||||
// The raw input processing
|
||||
if (maxlength > 0 && text_value.size() < maxlength) {
|
||||
if (maxlength > 0 && static_cast<int>(text_value.size()) < maxlength) {
|
||||
if (controller->uistate.last_unicode) {
|
||||
if ((controller->uistate.last_unicode & 0xFF80) == 0) {
|
||||
// we do not want to add special characters such as backspaces
|
||||
@@ -681,7 +685,7 @@ bool LineEditMasked (int id, int x, int y, std::string &text_value, const int &m
|
||||
break;
|
||||
default:
|
||||
// The raw input processing
|
||||
if (maxlength > 0 && text_value.size() < maxlength) {
|
||||
if (maxlength > 0 && static_cast<int>(text_value.size()) < maxlength) {
|
||||
if (controller->uistate.last_unicode) {
|
||||
if ((controller->uistate.last_unicode & 0xFF80) == 0) {
|
||||
char c = controller->uistate.last_unicode & 0x7F;
|
||||
@@ -789,6 +793,8 @@ float VerticalSlider (int id, int x, int y, int w, int h, float min_value, float
|
||||
controller->uistate.last_keysym = SDLK_CLEAR;
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@ class Module;
|
||||
class SoundSample {
|
||||
public:
|
||||
SoundSample() :
|
||||
mMixChunk (NULL),
|
||||
mChannel (-1) {
|
||||
mChannel (-1),
|
||||
mMixChunk (NULL) {
|
||||
}
|
||||
~SoundSample();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user