Changeset 657 for abuse/trunk/src/level.cppTweet

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/level.cpp (modified) (1 diff)

abuse/trunk/src/level.cpp

@@ -785 +785 @@
 void level::draw_areas(view *v)
 {
-  int32_t sx1,sy1,sx2,sy2;
-  area_controller *a=area_list;
-  for (; a; a=a->next)
-  {
-    int c1,c2;
-    if (a->active)
-    {
-      c1=morph_sel_frame_color;
-      c2=wm->bright_color();
-    } else
-    {
-      c2=morph_sel_frame_color;
-      c1=wm->bright_color();
-    }
-
-    the_game->game_to_mouse(a->x,a->y,v,sx1,sy1);
-    the_game->game_to_mouse(a->x+a->w,a->y+a->h,v,sx2,sy2);
-    main_screen->Rectangle(vec2i(sx1, sy1), vec2i(sx2, sy2), c1);
-    main_screen->Bar(vec2i(sx1 - 1, sy1 - 1), vec2i(sx1 + 1, sy1 + 1), c2);
-    main_screen->Bar(vec2i(sx2 - 1, sy2 - 1), vec2i(sx2 + 1, sy2 + 1), c2);
-  }
+    for (area_controller *a = area_list; a; a = a->next)
+    {
+        int c1 = a->active ? morph_sel_frame_color : wm->bright_color();
+        int c2 = a->active ? wm->bright_color() : morph_sel_frame_color;
+
+        vec2i pos1 = the_game->GameToMouse(vec2i(a->x, a->y), v);
+        vec2i pos2 = the_game->GameToMouse(vec2i(a->x + a->w, a->y + a->h), v);
+        main_screen->Rectangle(pos1, pos2, c1);
+        main_screen->Bar(pos1 - vec2i(1, 1), pos1 + vec2i(1, 1), c2);
+        main_screen->Bar(pos2 - vec2i(1, 1), pos2 + vec2i(1, 1), c2);
+    }
 }