LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small code style cleanup

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-07-21 21:17:55 -03:00
parent 34ebe18f14
commit 518ed6f524
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/filesystem/physfs/File.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ bool File::open(Mode mode)
throw love::Exception("Could not open file %s. Does not exist.", filename.c_str()); throw love::Exception("Could not open file %s. Does not exist.", filename.c_str());
// Check whether the write directory is set. // Check whether the write directory is set.
if ((mode == MODE_APPEND || mode == MODE_WRITE) && (PHYSFS_getWriteDir() == 0) && !hack_setupWriteDirectory()) if ((mode == MODE_APPEND || mode == MODE_WRITE) && (PHYSFS_getWriteDir() == nullptr) && !hack_setupWriteDirectory())
throw love::Exception("Could not set write directory."); throw love::Exception("Could not set write directory.");
// File already open? // File already open?
src/modules/window/sdl/Window.cpp
+3 -5
View File
@@ -448,7 +448,7 @@ bool Window::setWindow(int width, int height, WindowSettings *settings)
else else
{ {
sdlflags |= SDL_WINDOW_FULLSCREEN; sdlflags |= SDL_WINDOW_FULLSCREEN;
SDL_DisplayMode mode = {0, width, height, 0, 0}; SDL_DisplayMode mode = {0, width, height, 0, nullptr};
// Fullscreen window creation will bug out if no mode can be used. // Fullscreen window creation will bug out if no mode can be used.
if (SDL_GetClosestDisplayMode(f.display, &mode, &mode) == nullptr) if (SDL_GetClosestDisplayMode(f.display, &mode, &mode) == nullptr)
@@ -738,9 +738,7 @@ const char *Window::getDisplayName(int displayindex) const
return name; return name;
} }
typedef Window::WindowSize WindowSize; std::vector<Window::WindowSize> Window::getFullscreenSizes(int displayindex) const
std::vector<WindowSize> Window::getFullscreenSizes(int displayindex) const
{ {
std::vector<WindowSize> sizes; std::vector<WindowSize> sizes;
@@ -866,7 +864,7 @@ bool Window::setIcon(love::image::ImageData *imgd)
int h = imgd->getHeight(); int h = imgd->getHeight();
int pitch = imgd->getWidth() * 4; int pitch = imgd->getWidth() * 4;
SDL_Surface *sdlicon = 0; SDL_Surface *sdlicon = nullptr;
{ {
// We don't want another thread modifying the ImageData mid-copy. // We don't want another thread modifying the ImageData mid-copy.
src/modules/window/sdl/Window.h
+1 -1
View File
@@ -34,7 +34,7 @@ namespace window
namespace sdl namespace sdl
{ {
class Window : public love::window::Window class Window final : public love::window::Window
{ {
public: public: