diff options
| author | rubidium <rubidium@openttd.org> | 2014-01-02 22:41:58 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-01-02 22:41:58 +0000 |
| commit | 2618d960e30882c097ba8b68249bbae974700ac8 (patch) | |
| tree | 3d5a349c6a13f6f843d5f6b56456faf91010af5b /src/video/cocoa | |
| parent | 456dba4889108027f8af9c94514978d06012b6e7 (diff) | |
| download | openttd-2618d960e30882c097ba8b68249bbae974700ac8.tar.xz | |
(svn r26209) -Codechange: remove some template magic and simplify some code
Diffstat (limited to 'src/video/cocoa')
| -rw-r--r-- | src/video/cocoa/cocoa_v.mm | 8 | ||||
| -rw-r--r-- | src/video/cocoa/event.mm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index df2e7809c..4a95d1901 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -333,7 +333,7 @@ void QZ_GameSizeChanged() _screen.dst_ptr = _cocoa_subdriver->GetPixelBuffer(); _fullscreen = _cocoa_subdriver->IsFullscreen(); - BlitterFactoryBase::GetCurrentBlitter()->PostResize(); + BlitterFactory::GetCurrentBlitter()->PostResize(); GameSizeChanged(); } @@ -461,7 +461,7 @@ const char *VideoDriver_Cocoa::Start(const char * const *parm) int width = _cur_resolution.width; int height = _cur_resolution.height; - int bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth(); + int bpp = BlitterFactory::GetCurrentBlitter()->GetScreenDepth(); _cocoa_subdriver = QZ_CreateSubdriver(width, height, bpp, _fullscreen, true); if (_cocoa_subdriver == NULL) { @@ -514,7 +514,7 @@ bool VideoDriver_Cocoa::ChangeResolution(int w, int h) { assert(_cocoa_subdriver != NULL); - bool ret = _cocoa_subdriver->ChangeResolution(w, h, BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth()); + bool ret = _cocoa_subdriver->ChangeResolution(w, h, BlitterFactory::GetCurrentBlitter()->GetScreenDepth()); QZ_GameSizeChanged(); QZ_UpdateVideoModes(); @@ -539,7 +539,7 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen) if (full_screen != oldfs) { int width = _cocoa_subdriver->GetWidth(); int height = _cocoa_subdriver->GetHeight(); - int bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth(); + int bpp = BlitterFactory::GetCurrentBlitter()->GetScreenDepth(); delete _cocoa_subdriver; _cocoa_subdriver = NULL; diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index 4ebb899b5..b4f171a98 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -110,7 +110,7 @@ static void QZ_WarpCursor(int x, int y) static void QZ_CheckPaletteAnim() { if (_cur_palette.count_dirty != 0) { - Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); + Blitter *blitter = BlitterFactory::GetCurrentBlitter(); switch (blitter->UsePaletteAnimation()) { case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND: |