projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made code -Wshadow clean, missed a bunch of issues in the last commit
[supertux.git]
/
src
/
object
/
text_object.cpp
diff --git
a/src/object/text_object.cpp
b/src/object/text_object.cpp
index
7db2cac
..
ea1e4eb
100644
(file)
--- a/
src/object/text_object.cpp
+++ b/
src/object/text_object.cpp
@@
-21,7
+21,7
@@
#include "supertux/resources.hpp"
#include "video/drawing_context.hpp"
#include "supertux/resources.hpp"
#include "video/drawing_context.hpp"
-TextObject::TextObject(std::string name) :
+TextObject::TextObject(std::string name
_
) :
font(),
text(),
fading(0),
font(),
text(),
fading(0),
@@
-31,7
+31,7
@@
TextObject::TextObject(std::string name) :
anchor(ANCHOR_MIDDLE),
pos(0, 0)
{
anchor(ANCHOR_MIDDLE),
pos(0, 0)
{
- this->name = name;
+ this->name = name
_
;
font = Resources::normal_font;
centered = false;
}
font = Resources::normal_font;
centered = false;
}
@@
-59,51
+59,51
@@
TextObject::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
}
void
}
void
-TextObject::set_font(const std::string& name)
+TextObject::set_font(const std::string& name
_
)
{
{
- if(name == "normal") {
+ if(name
_
== "normal") {
font = Resources::normal_font;
font = Resources::normal_font;
- } else if(name == "big") {
+ } else if(name
_
== "big") {
font = Resources::big_font;
font = Resources::big_font;
- } else if(name == "small") {
+ } else if(name
_
== "small") {
font = Resources::small_font;
} else {
font = Resources::small_font;
} else {
- log_warning << "Unknown font '" << name << "'." << std::endl;
+ log_warning << "Unknown font '" << name
_
<< "'." << std::endl;
font = Resources::normal_font;
}
}
void
font = Resources::normal_font;
}
}
void
-TextObject::set_text(const std::string& text)
+TextObject::set_text(const std::string& text
_
)
{
{
- this->text = text;
+ this->text = text
_
;
}
void
}
void
-TextObject::fade_in(float fadetime)
+TextObject::fade_in(float fadetime
_
)
{
{
- this->fadetime = fadetime;
- fading = fadetime;
+ this->fadetime = fadetime
_
;
+ fading = fadetime
_
;
}
void
}
void
-TextObject::fade_out(float fadetime)
+TextObject::fade_out(float fadetime
_
)
{
{
- this->fadetime = fadetime;
- fading = -fadetime;
+ this->fadetime = fadetime
_
;
+ fading = -fadetime
_
;
}
void
}
void
-TextObject::set_visible(bool visible)
+TextObject::set_visible(bool visible
_
)
{
{
- this->visible = visible;
+ this->visible = visible
_
;
fading = 0;
}
void
fading = 0;
}
void
-TextObject::set_centered(bool centered)
+TextObject::set_centered(bool centered
_
)
{
{
- this->centered = centered;
+ this->centered = centered
_
;
}
void
}
void