Changeset 518 for abuse/trunk/src/scene.cppTweet

Timestamp:

Apr 20, 2011, 9:02:33 PM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: refactor dirty_rect clipping coordiantes so that the upper
bound is no longer inclusive. It will make things easier in the future.

File:

• abuse/trunk/src/scene.cpp (modified) (4 diffs)

abuse/trunk/src/scene.cpp

@@ -380 +380 @@
           text_blocker *first, JCFont *font)
 {
-  short cx1,cy1,cx2,cy2,word_size,word_len;
-  screen->get_clip(cx1,cy1,cx2,cy2);
-  screen->in_clip(x1,y1,x2,y2);
+  int cx1, cy1, cx2, cy2, word_size, word_len;
+  screen->GetClip(cx1, cy1, cx2, cy2);
+  screen->InClip(x1,y1,x2+1,y2+1);
   int h=font->height()+2,w=font->width(),x=x1,dist;
   y+=y1;
@@ -467 +467 @@
   }
 
-  screen->set_clip(cx1,cy1,cx2,cy2);
+  screen->SetClip(cx1, cy1, cx2, cy2);
   return (y<=y1);
 }
@@ -495 +495 @@
       text_loaded=0,frame_speed=100,scroll_speed=50,pan_speed=60,abort=0,text_step=-2;
 
-  short cx1,cy1,cx2,cy2;
+  int cx1, cy1, cx2, cy2;
 
   the_game->draw(1);
 
-  screen->get_clip(cx1,cy1,cx2,cy2);
-  screen->set_clip(the_game->viewx1,the_game->viewy1,
-           the_game->viewx2,the_game->viewy2);
+  screen->GetClip(cx1, cy1, cx2, cy2);
+  screen->SetClip(the_game->viewx1, the_game->viewy1,
+                   the_game->viewx2 + 1, the_game->viewy2 + 1);
 
 
@@ -709 +709 @@
 
   free(strng);
-  screen->set_clip(cx1,cy1,cx2,cy2);
+  screen->SetClip(cx1, cy1, cx2, cy2);
 
   the_game->draw(0);
 }
 
-
-