ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/AmigaOS/video_amiga.cpp
(Generate patch)

Comparing BasiliskII/src/AmigaOS/video_amiga.cpp (file contents):
Revision 1.14 by cebix, 2001-06-27T20:05:29Z vs.
Revision 1.15 by cebix, 2001-06-30T12:58:07Z

# Line 119 | Line 119 | static void set_video_monitor(uint32 wid
119                          mode.depth = VDEPTH_8BIT;
120                          break;
121                  case 15:
122 –                        mode.depth = VDEPTH_16BIT;
123 –                        break;
122                  case 16:
123                          mode.depth = VDEPTH_16BIT;
124                          break;
# Line 216 | Line 214 | static bool init_pip(int width, int heig
214          p96PIP_GetTags(the_win, P96PIP_SourceBitMap, (ULONG)&the_bitmap, TAG_END);
215  
216          // Add resolution and set VideoMonitor
219 –        set_video_monitor(width, height, p96GetBitMapAttr(the_bitmap, P96BMA_BYTESPERROW), 16);
217          VideoMonitor.mac_frame_base = p96GetBitMapAttr(the_bitmap, P96BMA_MEMORY);
218 +        set_video_monitor(width, height, p96GetBitMapAttr(the_bitmap, P96BMA_BYTESPERROW), 16);
219          return true;
220   }
221  
# Line 540 | Line 538 | void VideoExit(void)
538  
539   void video_set_palette(uint8 *pal)
540   {
541 <        if (display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX) {
541 >        if ((display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX)
542 >         && !IsDirectMode(VideoMonitor.mode)) {
543  
544                  // Convert palette to 32 bits
545                  ULONG table[2 + 256 * 3];

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines