[netrek-cvs] client/netrekxp/src data.c, 1.37, 1.38 newwin.c, 1.39, 1.40 litebitmaps.h, 1.1, NONE

[Bill Balcerski]

Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29999/src

Modified Files:
	data.c newwin.c 
Removed Files:
	litebitmaps.h 
Log Message:
Changed beeplite from built-into-the-client bitmaps to actual windows bitmaps

Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- newwin.c	13 Jun 2006 11:18:23 -0000	1.39
+++ newwin.c	14 Jun 2006 10:38:38 -0000	1.40
@@ -25,7 +25,6 @@
 #include "data.h"
 #include "playerlist.h"
 #include "bitmaps.h"
-#include "litebitmaps.h"
 #include "parsemeta.h"
 #include "packets.h"
 #include "spopt.h"
@@ -1157,26 +1156,34 @@
     }
     
 #ifdef BEEPLITE
+            
+    beeplite1 = 
+        W_StoreBitmap3 ("bitmaps/misclib/beepliteplayerm.bmp", emph_player_seq_width,
+                        emph_player_seq_height * emph_player_seq_frames, BMP_BEEPLITE1,
+                        mapw, LR_MONOCHROME);       
+
     for (i = 0; i < emph_player_seq_frames; i++)
-    {
         emph_player_seq[emph_player_seq_frames - (i + 1)] =
-	    W_StoreBitmap(emph_player_seq_width, emph_player_seq_height,
-	  		emph_player_seq_bits[i], mapw);
-    }
+            W_PointBitmap2 (beeplite1, 0, i, emph_player_seq_width, emph_player_seq_height);
 
+    beeplite2 = 
+        W_StoreBitmap3 ("bitmaps/misclib/beepliteplayerl.bmp", emph_player_seql_width,
+                        emph_player_seql_height * emph_player_seql_frames, BMP_BEEPLITE2,
+                        mapw, LR_MONOCHROME);      
+ 
     for (i = 0; i < emph_player_seql_frames; i++)
-    {
         emph_player_seql[emph_player_seql_frames - (i + 1)] =
-	    W_StoreBitmap(emph_player_seql_width, emph_player_seql_height,
-			emph_player_seql_bits[i], w);
-    }
+            W_PointBitmap2 (beeplite2, 0, i, emph_player_seql_width, emph_player_seql_height);
+
+    beeplite3 = 
+        W_StoreBitmap3 ("bitmaps/misclib/beepliteplanet.bmp", emph_planet_seq_width,
+                        emph_planet_seq_height * emph_planet_seq_frames, BMP_BEEPLITE3,
+                        mapw, LR_MONOCHROME);
 
     for (i = 0; i < emph_planet_seq_frames; i++)
-    {
         emph_planet_seq[emph_planet_seq_frames - (i + 1)] =
-	    W_StoreBitmap(emph_planet_seq_width, emph_planet_seq_height,
-			emph_planet_seq_bits[i], mapw);
-    }
+            W_PointBitmap2 (beeplite3, 0, i, emph_planet_seq_width, emph_planet_seq_height);
+
 #endif
 
 

--- litebitmaps.h DELETED ---

Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- data.c	13 Jun 2006 11:18:23 -0000	1.37
+++ data.c	14 Jun 2006 10:38:38 -0000	1.38
@@ -514,6 +514,9 @@
 {0,};
 int     emph_player_seq_n[MAXPLAYER] =
 {0,};
+W_Icon beeplite1;
+W_Icon beeplite2;
+W_Icon beeplite3;
 W_Icon  emph_planet_seq[10];
 W_Icon  emph_player_seq[10];
 W_Icon  emph_player_seql[10];