Advertisement
MageKing17

Untitled

Dec 15th, 2015
128
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.35 KB | None | 0 0
  1. diff --git a/code/bmpman/bmpman.cpp b/code/bmpman/bmpman.cpp
  2. index c6308cb..acb6f67 100644
  3. --- a/code/bmpman/bmpman.cpp
  4. +++ b/code/bmpman/bmpman.cpp
  5. @@ -488,7 +488,7 @@ int bm_load_sub_fast(const char *real_filename, int *handle, int dir_type = CF_T
  6.   */
  7.  int bm_load( const char *real_filename )
  8.  {
  9. -   int i, free_slot = -1;
  10. +   int i, id = -1, free_slot = -1;
  11.     int w, h, bpp = 8;
  12.     int rc = 0;
  13.     int bm_size = 0, mm_lvl = 0;
  14. @@ -580,6 +580,7 @@ int bm_load( const char *real_filename )
  15.     // Mark the slot as filled, because cf_read might load a new bitmap
  16.     // into this slot.
  17.     strncpy(bm_bitmaps[free_slot].filename, filename, MAX_FILENAME_LEN-1);
  18. +   bm_bitmaps[free_slot].id = id;
  19.     bm_bitmaps[free_slot].type = type;
  20.     bm_bitmaps[free_slot].comp_type = c_type;
  21.     bm_bitmaps[free_slot].signature = Bm_next_signature++;
  22. @@ -1176,16 +1177,6 @@ int bm_get_info( int handle, int *w, int * h, ubyte * flags, int *nframes, int *
  23.     }
  24.  }
  25.  
  26. -unsigned int bm_get_signature(int handle)
  27. -{
  28. -   if ( !bm_inited ) bm_init();
  29. -
  30. -   int bitmapnum = handle % MAX_BITMAPS;
  31. -   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!
  32. -
  33. -   return bm_bitmaps[bitmapnum].signature;
  34. -}
  35. -
  36.  /**
  37.   * Gets the image type
  38.   */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement