[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.22,1.23 gui_scree
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.22,1.23 gui_screen.cxx,1.13,1.14 |
Date: |
1 Dec 2002 21:45:16 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv29584
Modified Files:
action_button.cxx gui_screen.cxx
Log Message:
- fixed entrance propertie dialog
Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- action_button.cxx 1 Dec 2002 17:45:21 -0000 1.22
+++ action_button.cxx 1 Dec 2002 21:45:14 -0000 1.23
@@ -57,7 +57,11 @@
if ( name == Digger || name == Bomber
|| name == Floater || name == Blocker)
{
- sprite.set_direction(Sprite::LEFT);
+ is_multi_direct = true;
+ }
+ else
+ {
+ is_multi_direct = false;
}
}
@@ -70,7 +74,7 @@
void
ActionButton::update(float delta)
{
- sprite.update(delta);
+ sprite.update(0.010f); // FIXME: Dirty hack
}
ActionName
@@ -131,8 +135,9 @@
}
}
-
- gc.draw(sprite, Vector(x_pos, y_pos));
+ if (is_multi_direct)
+ sprite.set_direction(Sprite::RIGHT);
+ gc.draw(sprite, Vector(x_pos + 20, y_pos + 32));
// print the action name next to the button, when mouse pointer is on
// the button.
@@ -181,6 +186,7 @@
{
if (!fast_mode)
background.put_screen (x_pos, y_pos);
+
sprite.set_frame(7);
gc.draw(sprite, Vector(x_pos, y_pos));
}
@@ -189,7 +195,7 @@
void
ArmageddonButton::update (float delta)
{
- sprite.update(delta);
+ sprite.update(0.010f); // FIXME: Dirty hack
if (pressed)
{
Index: gui_screen.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_screen.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gui_screen.cxx 28 Oct 2002 20:13:40 -0000 1.13
+++ gui_screen.cxx 1 Dec 2002 21:45:14 -0000 1.14
@@ -51,7 +51,9 @@
void
GUIScreen::update (const GameDelta& delta)
{
+ // Dispatch the recieved input events
gui_manager->update (delta);
+
update (delta.get_time ());
for (std::list<Input::Event*>::const_iterator i = delta.get_events ().begin
();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.22,1.23 gui_screen.cxx,1.13,1.14,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor Makefile.am,1.29,1.30
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor object_selector_window.cxx,NONE,1.1 object_selector_window.hxx,NONE,1.1
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor Makefile.am,1.29,1.30
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor object_selector_window.cxx,NONE,1.1 object_selector_window.hxx,NONE,1.1
- Index(es):