equal
deleted
inserted
replaced
204 assert(_cocoa_subdriver != NULL); |
204 assert(_cocoa_subdriver != NULL); |
205 |
205 |
206 count = _cocoa_subdriver->ListModes(modes, lengthof(modes)); |
206 count = _cocoa_subdriver->ListModes(modes, lengthof(modes)); |
207 |
207 |
208 for (i = 0; i < count; i++) { |
208 for (i = 0; i < count; i++) { |
209 _resolutions[i][0] = modes[i].x; |
209 _resolutions[i].width = modes[i].x; |
210 _resolutions[i][1] = modes[i].y; |
210 _resolutions[i].height = modes[i].y; |
211 } |
211 } |
212 |
212 |
213 _num_resolutions = count; |
213 _num_resolutions = count; |
214 } |
214 } |
215 |
215 |
315 setupApplication(); |
315 setupApplication(); |
316 |
316 |
317 /* Don't create a window or enter fullscreen if we're just going to show a dialog. */ |
317 /* Don't create a window or enter fullscreen if we're just going to show a dialog. */ |
318 if (_cocoa_video_dialog) return NULL; |
318 if (_cocoa_video_dialog) return NULL; |
319 |
319 |
320 width = _cur_resolution[0]; |
320 width = _cur_resolution.width; |
321 height = _cur_resolution[1]; |
321 height = _cur_resolution.height; |
322 bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth(); |
322 bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth(); |
323 |
323 |
324 _cocoa_subdriver = QZ_CreateSubdriver(width, height, bpp, _fullscreen, true); |
324 _cocoa_subdriver = QZ_CreateSubdriver(width, height, bpp, _fullscreen, true); |
325 if (_cocoa_subdriver == NULL) { |
325 if (_cocoa_subdriver == NULL) { |
326 Stop(); |
326 Stop(); |