Update of /cvsroot/timewarp/source/gamex/general
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12699/source/gamex/general
Modified Files:
sprites.cpp
Log Message:
Index: sprites.cpp
===================================================================
RCS file: /cvsroot/timewarp/source/gamex/general/sprites.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sprites.cpp 24 Mar 2004 23:51:36 -0000 1.9
--- sprites.cpp 29 Jan 2006 16:14:33 -0000 1.10
***************
*** 247,352 ****
- // all the sprite-relevant information (and nothing else).
- SpaceSprite::SpaceSprite(BITMAP **bmplist, int sprite_count, int rotations, int _attributes)
- {
- count = sprite_count * rotations;
-
- int i, j, obpp;
- BITMAP *bmp, *tmp = NULL;
-
- if (_attributes == -1) _attributes = string_to_sprite_attributes(NULL);
-
- references = 0;
- highest_mip = 0;
- for (i = 1; i < MAX_MIP_LEVELS; i += 1) {
- b[i] = NULL;
- }
-
- general_attributes = _attributes;
- if (general_attributes & MATCH_SCREEN_FORMAT) {
- bpp = videosystem.bpp;
- if (general_attributes & ALPHA) {
- if (bpp <= 16) bpp = 16;
- else bpp = 32;
- bpp = 32;
- }
- }
- else bpp = 0;
-
- w = bmplist[0]->w;
- h = bmplist[0]->h;
- obpp = bitmap_color_depth(bmplist[0]);
-
- if (bpp == 0) bpp = obpp;
- if (obpp != bpp) tmp = create_bitmap_ex(obpp, w, h);
- if (general_attributes & ALPHA) {
- if (bpp <= 16) bpp = 16;
- else bpp = 32;
- }
-
-
- m = new PMASK*[count];
- b[0] = new BITMAP* [count];
- attributes = new char [count];
-
- for(i = 0; i < sprite_count; i += 1)
- {
-
- bmp = create_bitmap_ex(bpp, bmplist[i]->w, bmplist[i]->h);
- if (!tmp) tmp = bmp;
- if (general_attributes & MASKED)
- clear_to_color(bmp, bitmap_mask_color(bmp));
-
- if (tmp != bmp) clear_to_color(tmp, bitmap_mask_color(tmp));
-
- // if (general_attributes & ALPHA)
- // handle_alpha_load((BITMAP *)(images[i].dat));
-
- if (obpp != bpp)
- {
- convert_bitmap(bmplist[i], bmp, (general_attributes & MASKED) ? AA_MASKED : 0);
- } else {
- if (general_attributes & MASKED)
- draw_sprite(bmp, bmplist[i], 0, 0);
-
- else blit(bmplist[i], bmp, 0, 0, 0, 0, bmp->w, bmp->h);
- }
-
- color_correct_bitmap(bmp, general_attributes & MASKED);
-
- // make_alpha(bmp);
-
- if (tmp == bmp) tmp = NULL;
-
- for (j = 1; j < rotations; j += 1)
- {
- BITMAP *tmp = create_bitmap_ex(bpp, bmp->w, bmp->h);
- clear_to_color(tmp, bitmap_mask_color(tmp));
- rotate_sprite(tmp, bmp, 0, 0, j * ((1<<24)/rotations));
-
- // also replace the color ZERO with a transparancy color (why: I dislike bright pink)
- replace_color(tmp, 0, makecol_depth(bitmap_color_depth(tmp), 255, 0, 255));
-
- m[j + (i * rotations)] = create_allegro_pmask(tmp);
- b[0][j + (i * rotations)] = tmp;
- attributes[j + (i * rotations)] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
-
- }
-
- // also replace the color ZERO with a transparancy color (why: I dislike bright pink)
- replace_color(bmp, 0, makecol_depth(bitmap_color_depth(bmp), 255, 0, 255));
-
- m[(i * rotations)] = create_allegro_pmask(bmp);
- b[0][(i * rotations)] = bmp;
- attributes[(i * rotations)] = DEALLOCATE_IMAGE | DEALLOCATE_MASK;
-
- }
-
- if (general_attributes & MIPMAPED) {
- generate_mipmaps();
- }
- }
-
-
--- 247,250 ----
|
