Changeset 3550

Timestamp:

07/10/09 12:47:31 (4 years ago)

Author:

pterjan

Message:

• Use utf8 format instead of ansi.

With ansi the width of the sprite canvas is 80 so they have to go very far to the left before getting re-positionned.

File:

• neercs/trunk/src/screensaver.c (modified) (3 diffs)

neercs/trunk/src/screensaver.c

@@ -125 +125 @@
         caca_import_memory(flying_toaster->toaster[i],
                            toaster_text[i],
-                           strlen(toaster_text[i]), "ansi");        
+                           strlen(toaster_text[i]), "utf8");        
         caca_import_memory(flying_toaster->mask[i],
                            toaster_mask[i],
-                           strlen(toaster_mask[i]), "ansi");        
+                           strlen(toaster_mask[i]), "utf8");        
     }
 
@@ -157 +157 @@
 {
     struct flying_toaster *d = screen_list->screensaver_data;
-    int i, w, h;
+    int i, w, h, x, y, s;
     if(!d) return;
 
     w = caca_get_canvas_width(screen_list->cv);
     h = caca_get_canvas_height(screen_list->cv);
-
 
     caca_set_color_ansi(screen_list->cv, CACA_WHITE, CACA_BLACK);
@@ -169 +168 @@
     for(i = 0; i < COUNT; i++)
     {
-        caca_blit(screen_list->cv, d->x[i]/PRECISION, d->y[i]/PRECISION, d->toaster[d->s[i]/PRECISION], d->mask[d->s[i]/PRECISION]);
+        x = d->x[i]/PRECISION;
+        y = d->y[i]/PRECISION;
+        s = d->s[i]/PRECISION;
+
+        caca_blit(screen_list->cv, x, y, d->toaster[s], d->mask[s]);
 
         d->x[i]-=40;
         d->y[i]+=10;
 
-        if((d->x[i]/PRECISION) + caca_get_canvas_width(d->toaster[d->s[i]/PRECISION])<=0)
-            d->x[i] = ((rand()%w)+w) * PRECISION;
-        if((d->y[i]/PRECISION)>=h)
-            d->y[i] = ((rand()%h)-h) * PRECISION;
+        if(d->x[i]/PRECISION + caca_get_canvas_width(d->toaster[s])<=0)
+            d->x[i] = ((rand()%w)/3+w) * PRECISION;
+        if(d->y[i]/PRECISION>=h)
+            d->y[i] = ((rand()%h)/2-h) * PRECISION;
 
         d->s[i] = ((d->s[i]+24)%(3*PRECISION));