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

Timestamp:

Sep 12, 2011, 10:17:23 PM (11 years ago)

Author:

Sam Hocevar

Message:

core: rename vec2i to ivec2 and update matrix.h from Lol Engine.

File:

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

abuse/trunk/src/game.h

@@ -107 +107 @@
                return cache.foret(foretiles[x]); }
 
-    vec2i GetFgTile(vec2i pos);
-    vec2i GetBgTile(vec2i pos);
+    ivec2 GetFgTile(ivec2 pos);
+    ivec2 GetBgTile(ivec2 pos);
   void toggle_delay();
   void set_delay(int on) { no_delay=!on; }
   void pan(int xv, int yv);
 
-    vec2i MouseToGame(vec2i pos, view *v = NULL);
-    vec2i GameToMouse(vec2i pos, view *v);
-    view *GetView(vec2i pos);
+    ivec2 MouseToGame(ivec2 pos, view *v = NULL);
+    ivec2 GameToMouse(ivec2 pos, view *v);
+    view *GetView(ivec2 pos);
 
   int calc_speed();
@@ -125 +125 @@
 
 
-    void PutFg(vec2i pos, int type);
-    void PutBg(vec2i pos, int type);
+    void PutFg(ivec2 pos, int type);
+    void PutBg(ivec2 pos, int type);
   void draw_map(view *v, int interpolate=0);
   void dev_scroll();
@@ -134 +134 @@
   void set_level(level *nl);
   void show_time();
-    tile_type GetMapBg(vec2i pos) { return current_level->GetBg(pos); }
-    tile_type GetMapFg(vec2i pos) { return current_level->GetFg(pos); }
+    tile_type GetMapBg(ivec2 pos) { return current_level->GetBg(pos); }
+    tile_type GetMapFg(ivec2 pos) { return current_level->GetFg(pos); }
   void end_session();
   void need_refresh() { refresh=1; }       // for development mode only