[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3059 - in trunk/pingus/src: . gui
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3059 - in trunk/pingus/src: . gui |
Date: |
Sun, 2 Sep 2007 05:48:53 +0200 |
Author: grumbel
Date: 2007-09-02 05:48:52 +0200 (Sun, 02 Sep 2007)
New Revision: 3059
Added:
trunk/pingus/src/input_old/
Removed:
trunk/pingus/src/input/
Modified:
trunk/pingus/src/gui/cursor.cpp
trunk/pingus/src/gui/screen_manager.cpp
Log:
- on the way to replace input/ with input2/ (incomplete commit due to svn not
being able to swap input/ and input2/ in one commit)
Modified: trunk/pingus/src/gui/cursor.cpp
===================================================================
--- trunk/pingus/src/gui/cursor.cpp 2007-09-02 02:24:47 UTC (rev 3058)
+++ trunk/pingus/src/gui/cursor.cpp 2007-09-02 03:48:52 UTC (rev 3059)
@@ -17,8 +17,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../input/controller.hpp"
-#include "../input/pointer.hpp"
+//#include "../input/controller.hpp"
+//#include "../input/pointer.hpp"
#include "../resource.hpp"
#include "cursor.hpp"
@@ -41,6 +41,7 @@
void
Cursor::on_event()
{
+ // FIXME: This should use the input framework
int x,y;
SDL_GetMouseState(&x, &y);
sprite.draw((float)x, (float)y, Display::get_screen());
Modified: trunk/pingus/src/gui/screen_manager.cpp
===================================================================
--- trunk/pingus/src/gui/screen_manager.cpp 2007-09-02 02:24:47 UTC (rev
3058)
+++ trunk/pingus/src/gui/screen_manager.cpp 2007-09-02 03:48:52 UTC (rev
3059)
@@ -52,6 +52,7 @@
input_controller = new Input::Controller("controller/default.scm");
else
input_controller = new Input::Controller(controller_file);
+
Input::Controller::set_current(input_controller);
Cursor* cursor = 0;
Copied: trunk/pingus/src/input_old (from rev 3055, trunk/pingus/src/input)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3059 - in trunk/pingus/src: . gui,
grumbel at BerliOS <=