Changeset 657 for abuse/trunk/src/game.hTweet

Timestamp:

May 15, 2011, 6:22:17 AM (11 years ago)

Author:

Sam Hocevar

Message:

game: refactor the mouse/game coordinate conversion logic.

File:

• abuse/trunk/src/game.h (modified) (3 diffs)

abuse/trunk/src/game.h

@@ -63 +63 @@
 class Game
 {
+public:
+    Game(int argc, char **argv);
+    ~Game();
+
 private:
   JCFont *fnt;
@@ -89 +93 @@
   int state,zoom;
 
-  Game(int argc, char **argv);
-  ~Game();
-
   void step();
   void show_help(char const *st);
@@ -106 +107 @@
                return cache.foret(foretiles[x]); }
 
-  void ftile_on(int screenx, int screeny, int32_t &x, int32_t &y);
-  void btile_on(int screenx, int screeny, int32_t &x, int32_t &y);
+    vec2i GetFgTile(vec2i pos);
+    vec2i GetBgTile(vec2i pos);
   void toggle_delay();
   void set_delay(int on) { no_delay=!on; }
   void pan(int xv, int yv);
 
-  void mouse_to_game(int32_t x, int32_t y, int32_t &gamex, int32_t &gamey, view *v=NULL);
-  void game_to_mouse(int32_t gamex, int32_t gamey, view *which, int32_t &x, int32_t &y);
-  view *view_in(int mousex, int mousey);
+    vec2i MouseToGame(vec2i pos, view *v = NULL);
+    vec2i GameToMouse(vec2i pos, view *v);
+    view *GetView(vec2i pos);
 
   int calc_speed();