[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3915 - in trunk/pingus/src: editor worldmap
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3915 - in trunk/pingus/src: editor worldmap |
Date: |
Sun, 27 Jul 2008 16:22:32 +0200 |
Author: grumbel
Date: 2008-07-27 16:22:32 +0200 (Sun, 27 Jul 2008)
New Revision: 3915
Modified:
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/worldmap/worldmap_component.cpp
Log:
Some more float/int cleanup
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2008-07-27 14:20:12 UTC
(rev 3914)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2008-07-27 14:22:32 UTC
(rev 3915)
@@ -57,7 +57,7 @@
if (set)
{
gc.push_modelview();
- gc.translate(0, offset);
+ gc.translate(0, static_cast<int>(offset));
for(Objects::const_iterator i = set->get_objects().begin(); i !=
set->get_objects().end(); ++i)
{
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2008-07-27 14:20:12 UTC (rev
3914)
+++ trunk/pingus/src/editor/viewport.cpp 2008-07-27 14:22:32 UTC (rev
3915)
@@ -345,7 +345,7 @@
UNUSED_ARG(delta);
if (current_action == SCROLLING)
- state.set_pos(state.get_pos() + Vector2i(mouse_screen_pos -
drag_screen_pos) * delta * 5.0f);
+ state.set_pos(Vector2i(state.get_pos() + Vector2i(mouse_screen_pos -
drag_screen_pos) * delta * 5));
// Autoscroll if necessary
if (autoscroll)
Modified: trunk/pingus/src/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_component.cpp 2008-07-27 14:20:12 UTC
(rev 3914)
+++ trunk/pingus/src/worldmap/worldmap_component.cpp 2008-07-27 14:22:32 UTC
(rev 3915)
@@ -42,7 +42,7 @@
scene_context->clear();
scene_context->push_modelview();
- scene_context->translate((float)cliprect.left, (float)cliprect.top);
+ scene_context->translate(cliprect.left, cliprect.top);
scene_context->set_cliprect(cliprect);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3915 - in trunk/pingus/src: editor worldmap,
grumbel at BerliOS <=