ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/MacOSX/video_macosx.mm
(Generate patch)

Comparing BasiliskII/src/MacOSX/video_macosx.mm (file contents):
Revision 1.12 by nigel, 2004-01-20T23:41:11Z vs.
Revision 1.15 by gbeauche, 2005-01-30T21:42:13Z

# Line 4 | Line 4
4   *  video_macosx.mm - Interface between Basilisk II and Cocoa windowing.
5   *                    Based on video_amiga.cpp and video_x.cpp
6   *
7 < *  Basilisk II (C) 1997-2004 Christian Bauer
7 > *  Basilisk II (C) 1997-2005 Christian Bauer
8   *
9   *  This program is free software; you can redistribute it and/or modify
10   *  it under the terms of the GNU General Public License as published by
# Line 101 | Line 101 | colours_from_depth(const uint16 depth)
101   bool
102   parse_screen_prefs(const char *mode_str)
103   {
104 +        if ( ! mode_str )
105 +        {
106 +                // No screen pref was found. Supply a default:
107 +                mode_str = "win/512/384";
108 +        }
109 +
110          if (sscanf(mode_str, "win/%hd/%hd/%hd",
111                                  &init_width, &init_height, &init_depth) == 3)
112                  display_type = DISPLAY_WINDOW;

Diff Legend

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