Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/code/bmpman/bmpman.cpp b/code/bmpman/bmpman.cpp
- index c6308cb..acb6f67 100644
- --- a/code/bmpman/bmpman.cpp
- +++ b/code/bmpman/bmpman.cpp
- @@ -488,7 +488,7 @@ int bm_load_sub_fast(const char *real_filename, int *handle, int dir_type = CF_T
- */
- int bm_load( const char *real_filename )
- {
- - int i, free_slot = -1;
- + int i, id = -1, free_slot = -1;
- int w, h, bpp = 8;
- int rc = 0;
- int bm_size = 0, mm_lvl = 0;
- @@ -580,6 +580,7 @@ int bm_load( const char *real_filename )
- // Mark the slot as filled, because cf_read might load a new bitmap
- // into this slot.
- strncpy(bm_bitmaps[free_slot].filename, filename, MAX_FILENAME_LEN-1);
- + bm_bitmaps[free_slot].id = id;
- bm_bitmaps[free_slot].type = type;
- bm_bitmaps[free_slot].comp_type = c_type;
- bm_bitmaps[free_slot].signature = Bm_next_signature++;
- @@ -1176,16 +1177,6 @@ int bm_get_info( int handle, int *w, int * h, ubyte * flags, int *nframes, int *
- }
- }
- -unsigned int bm_get_signature(int handle)
- -{
- - if ( !bm_inited ) bm_init();
- -
- - int bitmapnum = handle % MAX_BITMAPS;
- - Assertion( bm_bitmaps[bitmapnum].handle == handle, "Invalid bitmap handle %d passed to bm_get_signature().\nThis might be due to an invalid animation somewhere else.\n", handle ); // INVALID BITMAP HANDLE!
- -
- - return bm_bitmaps[bitmapnum].signature;
- -}
- -
- /**
- * Gets the image type
- */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement