thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: Use nullptr where appropriate

Browse source
This commit is contained in:
Le Philousophe 2021-11-06 13:04:25 +01:00 • committed by Paweł Kołodziejski
parent 8321056107
commit 40a036ac0b
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backends/graphics3d/android/texture.cpp
View file

@ -203,8 +203,8 @@ const Graphics::PixelFormat &GLESBaseTexture::getPixelFormat() const {
GLESTexture::GLESTexture(GLenum glFormat, GLenum glType, GLESTexture::GLESTexture(GLenum glFormat, GLenum glType,
Graphics::PixelFormat pixelFormat) : Graphics::PixelFormat pixelFormat) :
GLESBaseTexture(glFormat, glType, pixelFormat), GLESBaseTexture(glFormat, glType, pixelFormat),
_pixels(0), _pixels(nullptr),
_buf(0) { _buf(nullptr) {
} }
GLESTexture::~GLESTexture() { GLESTexture::~GLESTexture() {
@ -340,10 +340,9 @@ GLES565Texture::~GLES565Texture() {
GLESFakePaletteTexture::GLESFakePaletteTexture(GLenum glFormat, GLenum glType, GLESFakePaletteTexture::GLESFakePaletteTexture(GLenum glFormat, GLenum glType,
Graphics::PixelFormat pixelFormat) : Graphics::PixelFormat pixelFormat) :
GLESBaseTexture(glFormat, glType, pixelFormat), GLESBaseTexture(glFormat, glType, pixelFormat),
_palette(0), _palette(nullptr),
_pixels(0), _pixels(nullptr),
_buf(0) _buf(nullptr) {
{
_palettePixelFormat = pixelFormat; _palettePixelFormat = pixelFormat;
_fake_format = Graphics::PixelFormat::createFormatCLUT8(); _fake_format = Graphics::PixelFormat::createFormatCLUT8();

2
backends/platform/android/touchcontrols.cpp
View file

@ -48,7 +48,7 @@
#include "backends/platform/android/touchcontrols.h" #include "backends/platform/android/touchcontrols.h"
TouchControls::TouchControls() : TouchControls::TouchControls() :
_arrows_texture(NULL), _arrows_texture(nullptr),
_screen_width(0), _screen_width(0),
_screen_height(0) { _screen_height(0) {
} }