projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...
[supertux.git]
/
src
/
object
/
display_effect.hpp
diff --git
a/src/object/display_effect.hpp
b/src/object/display_effect.hpp
index
0a858b7
..
8c3f857
100644
(file)
--- a/
src/object/display_effect.hpp
+++ b/
src/object/display_effect.hpp
@@
-28,15
+28,21
@@
class DisplayEffect : public GameObject, public Scripting::DisplayEffect,
public ScriptInterface
{
public:
public ScriptInterface
{
public:
- DisplayEffect();
+ DisplayEffect(
std::string name = ""
);
virtual ~DisplayEffect();
virtual ~DisplayEffect();
- void expose(HSQUIRRELVM vm,
int
table_idx);
- void unexpose(HSQUIRRELVM vm,
int
table_idx);
+ void expose(HSQUIRRELVM vm,
SQInteger
table_idx);
+ void unexpose(HSQUIRRELVM vm,
SQInteger
table_idx);
void update(float elapsed_time);
void draw(DrawingContext& context);
void update(float elapsed_time);
void draw(DrawingContext& context);
+
+ /**
+ * @name Scriptable Methods
+ * @{
+ */
+
void fade_out(float fadetime);
void fade_in(float fadetime);
void set_black(bool enabled);
void fade_out(float fadetime);
void fade_in(float fadetime);
void set_black(bool enabled);
@@
-44,6
+50,10
@@
public:
void sixteen_to_nine(float fadetime);
void four_to_three(float fadetime);
void sixteen_to_nine(float fadetime);
void four_to_three(float fadetime);
+ /**
+ * @}
+ */
+
private:
enum FadeType {
NO_FADE, FADE_IN, FADE_OUT
private:
enum FadeType {
NO_FADE, FADE_IN, FADE_OUT
@@
-55,10
+65,9
@@
private:
float border_fadetime;
float border_fading;
float border_size;
float border_fadetime;
float border_fading;
float border_size;
-
+
bool black;
bool borders;
};
#endif
bool black;
bool borders;
};
#endif
-