[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2453 - in trunk: data/controller data/data src
From: |
David Philippi at BerliOS |
Subject: |
[Pingus-CVS] r2453 - in trunk: data/controller data/data src |
Date: |
Wed, 5 Oct 2005 13:32:10 +0200 |
Author: torangan
Date: 2005-10-05 13:32:03 +0200 (Wed, 05 Oct 2005)
New Revision: 2453
Modified:
trunk/data/controller/default.xml
trunk/data/data/entrances.xml
trunk/src/action_button.cxx
trunk/src/playfield.cxx
trunk/src/tinygettext.cxx
Log:
applied various patches sent to the ML
Modified: trunk/data/controller/default.xml
===================================================================
--- trunk/data/controller/default.xml 2005-09-30 17:43:07 UTC (rev 2452)
+++ trunk/data/controller/default.xml 2005-10-05 11:32:03 UTC (rev 2453)
@@ -15,30 +15,30 @@
<pause-button>
<key-button>
- <key>P</key>
+ <key>p</key>
</key-button>
</pause-button>
<fast-forward-button>
<multiple-button>
<key-button>
- <key>F</key>
+ <key>f</key>
</key-button>
<key-button>
- <key>SPACE</key>
+ <key>space</key>
</key-button>
</multiple-button>
</fast-forward-button>
<armageddon-button>
<key-button>
- <key>A</key>
+ <key>a</key>
</key-button>
</armageddon-button>
<escape-button>
<key-button>
- <key>ESCAPE</key>
+ <key>escape</key>
</key-button>
</escape-button>
@@ -46,21 +46,21 @@
<axis-scroller>
<speed>1000</speed>
<button-axis>
- <angle>-90</angle>
+ <angle>90</angle>
<key-button>
- <key>DOWN</key>
+ <key>down</key>
</key-button>
<key-button>
- <key>UP</key>
+ <key>up</key>
</key-button>
</button-axis>
<button-axis>
<angle>0</angle>
<key-button>
- <key>RIGHT</key>
+ <key>right</key>
</key-button>
<key-button>
- <key>LEFT</key>
+ <key>left</key>
</key-button>
</button-axis>
</axis-scroller>
@@ -82,7 +82,7 @@
<action-up>
<multiple-button>
<key-button>
- <key>PAGEUP</key>
+ <key>prior</key>
</key-button>
<mouse-button>
<button>5</button>
@@ -93,7 +93,7 @@
<action-down>
<multiple-button>
<key-button>
- <key>PAGEDOWN</key>
+ <key>next</key>
</key-button>
<mouse-button>
<button>4</button>
Modified: trunk/data/data/entrances.xml
===================================================================
--- trunk/data/data/entrances.xml 2005-09-30 17:43:07 UTC (rev 2452)
+++ trunk/data/data/entrances.xml 2005-10-05 11:32:03 UTC (rev 2453)
@@ -60,11 +60,11 @@
<image file="../images/entrances/industrial_top.png"/>
</sprite>
<sprite name="snow_front">
- <translation origin="bottom_center"/>
+ <!--<translation origin="bottom_center"/>-->
<image file="../images/entrances/snow_front.png"/>
</sprite>
<sprite name="snow_back">
- <translation origin="bottom_center"/>
+ <!--<translation origin="bottom_center"/>-->
<image file="../images/entrances/snow_back.png"/>
</sprite>
</section>
Modified: trunk/src/action_button.cxx
===================================================================
--- trunk/src/action_button.cxx 2005-09-30 17:43:07 UTC (rev 2452)
+++ trunk/src/action_button.cxx 2005-10-05 11:32:03 UTC (rev 2453)
@@ -50,6 +50,7 @@
font_b = Fonts::pingus_large;
sprite = Resource::load_sprite("pingus/" + action_to_string(name) +
"/right");
+ sprite.set_play_loop(true);
}
bool
Modified: trunk/src/playfield.cxx
===================================================================
--- trunk/src/playfield.cxx 2005-09-30 17:43:07 UTC (rev 2452)
+++ trunk/src/playfield.cxx 2005-10-05 11:32:03 UTC (rev 2453)
@@ -191,23 +191,24 @@
if (auto_scrolling)
{
- // FIXME: This should be delta dependant
- scroll_speed = 15;
-
- if (mouse_pos.x < 2)
+ // FIXME: May need to modify this function if it's not gradient enough.
+ scroll_speed = static_cast<int>(800 * delta);
+ //std::cout << "scroll_speed: " << scroll_speed << std::endl;
+
+ if (mouse_pos.x < 10)
{
state.set_pos(state.get_pos() - CL_Point(scroll_speed, 0));
}
- else if (mouse_pos.x > CL_Display::get_width() - 3)
+ else if (mouse_pos.x > CL_Display::get_width() - 10)
{
state.set_pos(state.get_pos() + CL_Point(scroll_speed, 0));
}
- if (mouse_pos.y < 2)
+ if (mouse_pos.y < 10)
{
state.set_pos(state.get_pos() - CL_Point(0, scroll_speed));
}
- else if (mouse_pos.y > CL_Display::get_height() - 3)
+ else if (mouse_pos.y > CL_Display::get_height() - 10)
{
state.set_pos(state.get_pos() + CL_Point(0, scroll_speed));
}
Modified: trunk/src/tinygettext.cxx
===================================================================
--- trunk/src/tinygettext.cxx 2005-09-30 17:43:07 UTC (rev 2452)
+++ trunk/src/tinygettext.cxx 2005-10-05 11:32:03 UTC (rev 2453)
@@ -86,7 +86,7 @@
size_t in_size = text.size();
size_t out_size = 4*in_size; // Worst case scenario: ASCII ->
UTF-32?
std::string result(out_size, ' ');
- const char* in_str = &text[0];
+ char* in_str = &text[0];
char* out_str = &result[0];
// Try to convert the text.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2453 - in trunk: data/controller data/data src,
David Philippi at BerliOS <=