Restore and fix compile warnings
This commit is contained in:
parent
ad04043a88
commit
f650b0e5bb
|
@ -21,8 +21,8 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(ARCH_FLAGS "-m32 -march=i686 -mtune=generic")
|
SET(ARCH_FLAGS "-m32 -march=i686 -mtune=generic")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
SET(WARNS_FLAGS "-Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-but-set-variable")
|
SET(WARNS_FLAGS "-Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-unused-variable")
|
||||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNS} ${ARCH_FLAGS} -std=gnu++0x -pipe")
|
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNS_FLAGS} ${ARCH_FLAGS} -std=gnu++0x -pipe")
|
||||||
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
|
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb")
|
||||||
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O1 -ggdb -fno-omit-frame-pointer")
|
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O1 -ggdb -fno-omit-frame-pointer")
|
||||||
SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
|
SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
|
||||||
|
|
|
@ -93,7 +93,7 @@ public:
|
||||||
void update_what() {
|
void update_what() {
|
||||||
m_what = format("failed to cast value of type '%s' to type '%s'", demangle_type<T>(), demangle_type<R>());
|
m_what = format("failed to cast value of type '%s' to type '%s'", demangle_type<T>(), demangle_type<R>());
|
||||||
}
|
}
|
||||||
virtual const char* what() { return m_what.c_str(); }
|
virtual const char* what() const throw() { return m_what.c_str(); }
|
||||||
private:
|
private:
|
||||||
std::string m_what;
|
std::string m_what;
|
||||||
};
|
};
|
||||||
|
|
|
@ -32,7 +32,7 @@ AnimatedText::AnimatedText()
|
||||||
m_cachedText.setAlign(Fw::AlignLeft);
|
m_cachedText.setAlign(Fw::AlignLeft);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AnimatedText::draw(const Point& dest, const Rect& visibleRect)
|
void AnimatedText::drawText(const Point& dest, const Rect& visibleRect)
|
||||||
{
|
{
|
||||||
Point p = dest;
|
Point p = dest;
|
||||||
Size textSize = m_cachedText.getTextSize();
|
Size textSize = m_cachedText.getTextSize();
|
||||||
|
|
|
@ -33,7 +33,7 @@ class AnimatedText : public Thing
|
||||||
public:
|
public:
|
||||||
AnimatedText();
|
AnimatedText();
|
||||||
|
|
||||||
void draw(const Point& dest, const Rect& visibleRect);
|
void drawText(const Point& dest, const Rect& visibleRect);
|
||||||
void startAnimation();
|
void startAnimation();
|
||||||
|
|
||||||
void setColor(int color);
|
void setColor(int color);
|
||||||
|
|
|
@ -177,7 +177,7 @@ void MapView::draw(const Rect& rect)
|
||||||
p.x = p.x * horizontalStretchFactor;
|
p.x = p.x * horizontalStretchFactor;
|
||||||
p.y = p.y * verticalStretchFactor;
|
p.y = p.y * verticalStretchFactor;
|
||||||
p += rect.topLeft();
|
p += rect.topLeft();
|
||||||
staticText->draw(p, rect);
|
staticText->drawText(p, rect);
|
||||||
}
|
}
|
||||||
|
|
||||||
for(const AnimatedTextPtr& animatedText : g_map.getAnimatedTexts()) {
|
for(const AnimatedTextPtr& animatedText : g_map.getAnimatedTexts()) {
|
||||||
|
@ -195,7 +195,7 @@ void MapView::draw(const Rect& rect)
|
||||||
p.x = p.x * horizontalStretchFactor;
|
p.x = p.x * horizontalStretchFactor;
|
||||||
p.y = p.y * verticalStretchFactor;
|
p.y = p.y * verticalStretchFactor;
|
||||||
p += rect.topLeft();
|
p += rect.topLeft();
|
||||||
animatedText->draw(p, rect);
|
animatedText->drawText(p, rect);
|
||||||
}
|
}
|
||||||
} else if(m_viewMode > NEAR_VIEW) {
|
} else if(m_viewMode > NEAR_VIEW) {
|
||||||
// draw a cross in the center instead of our creature
|
// draw a cross in the center instead of our creature
|
||||||
|
|
|
@ -32,7 +32,7 @@ StaticText::StaticText()
|
||||||
m_cachedText.setAlign(Fw::AlignCenter);
|
m_cachedText.setAlign(Fw::AlignCenter);
|
||||||
}
|
}
|
||||||
|
|
||||||
void StaticText::draw(const Point& dest, const Rect& parentRect)
|
void StaticText::drawText(const Point& dest, const Rect& parentRect)
|
||||||
{
|
{
|
||||||
Size textSize = m_cachedText.getTextSize();
|
Size textSize = m_cachedText.getTextSize();
|
||||||
Rect rect = Rect(dest - Point(textSize.width() / 2, textSize.height()) + Point(20, 5), textSize);
|
Rect rect = Rect(dest - Point(textSize.width() / 2, textSize.height()) + Point(20, 5), textSize);
|
||||||
|
|
|
@ -33,7 +33,7 @@ class StaticText : public Thing
|
||||||
public:
|
public:
|
||||||
StaticText();
|
StaticText();
|
||||||
|
|
||||||
void draw(const Point& dest, const Rect& parentRect);
|
void drawText(const Point& dest, const Rect& parentRect);
|
||||||
|
|
||||||
std::string getName() { return m_name; }
|
std::string getName() { return m_name; }
|
||||||
Otc::SpeakType getMessageType() { return m_messageType; }
|
Otc::SpeakType getMessageType() { return m_messageType; }
|
||||||
|
|
|
@ -27,8 +27,9 @@
|
||||||
#include <framework/graphics/declarations.h>
|
#include <framework/graphics/declarations.h>
|
||||||
#include <framework/graphics/coordsbuffer.h>
|
#include <framework/graphics/coordsbuffer.h>
|
||||||
|
|
||||||
struct ThingType
|
class ThingType
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
enum Dimension {
|
enum Dimension {
|
||||||
Width = 0,
|
Width = 0,
|
||||||
Height,
|
Height,
|
||||||
|
|
Loading…
Reference in New Issue