RE: [AD] Changes in CVS and some comments about patches

["Vincent Penquerc'h" <vincent@xxxxxxxxxx>]

> >   Updated tools/grabber.c  (perhaps grabber should say that
> >   compression type is not supported if it is outside of range)?

--- tools/grabber.c.warn	Mon Nov 13 22:01:31 2000
+++ tools/grabber.c	Mon Nov 13 22:11:38 2000
@@ -1616,6 +1616,7 @@
    int new_obj_count;
    int sort;
    char *sort_prop;
+   char buf[256];

    set_mouse_sprite(my_busy_pointer);
    busy_mouse = TRUE;
@@ -1685,10 +1686,18 @@

    main_dlg[DLG_PACKLIST].d1 = atoi(get_datafile_property(&datedit_info,
DAT_PACK));
    pack_getter(-1,&obj_count);
-   if (main_dlg[DLG_PACKLIST].d1 >= obj_count)
+   if (main_dlg[DLG_PACKLIST].d1 >= obj_count) {
+      sprintf(buf, "File has unknown compression method (%d). Using %d",
+              main_dlg[DLG_PACKLIST].d1, obj_count-1);
+      alert(buf, NULL, NULL, "OK", NULL, 0, 0);
       main_dlg[DLG_PACKLIST].d1 = obj_count-1;
-   else if (main_dlg[DLG_PACKLIST].d1 < 0)
+   }
+   else if (main_dlg[DLG_PACKLIST].d1 < 0) {
+      sprintf(buf, "File has invalid compression method (%d). Using %d",
+              main_dlg[DLG_PACKLIST].d1, 0);
+      alert(buf, NULL, NULL, "OK", NULL, 0, 0);
       main_dlg[DLG_PACKLIST].d1 = 0;
+   }

    rebuild_list(NULL, TRUE);

> >   Can not apply patch to src/gui.c, because there is not enough
> >   context in diff file.
Sorry, here it is again:

--- gui.c.2	Sun Oct 29 17:21:54 2000
+++ gui.c	Sun Oct 29 17:22:14 2000
@@ -770,13 +770,13 @@
          if (!(new_mouse_b & 2) && (player->mouse_b & 2))
 	    MESSAGE(player->mouse_obj, MSG_RRELEASE, new_mouse_b);

-         player->mouse_b = new_mouse_b;
-
 	 if (player->res == D_O_K)
 	    player->click_wait = TRUE;
       }
       else
 	 dialog_message(player->dialog, MSG_IDLE, 0, &nowhere);
+
+      player->mouse_b = new_mouse_b;

       goto getout;
    }

I'll look into the property stripping later on, as I lack the time now.
Thanks!

--
Lyrian
"Linux is keyboard friendly. I don't smash it like I used to with Windows"