mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Merge pull request #35 from charliebruce/quick-fixes

Browse source 
Quick fixes
This commit is contained in:
Ethan Lee 2020-01-11 00:35:46 -05:00 committed by GitHub
commit f4767ce18b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop_version/CMakeLists.txt
View file

@ -2,7 +2,6 @@
# Written by Ethan "flibitijibibo" Lee # Written by Ethan "flibitijibibo" Lee
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
PROJECT(VVVVVV)
# Architecture Flags # Architecture Flags
IF(APPLE) IF(APPLE)
@ -11,7 +10,8 @@ IF(APPLE)
IF(IS_DIRECTORY ${OSX_10_9_SDK_PATH}) IF(IS_DIRECTORY ${OSX_10_9_SDK_PATH})
SET(CMAKE_OSX_SYSROOT ${OSX_10_9_SDK_PATH}) SET(CMAKE_OSX_SYSROOT ${OSX_10_9_SDK_PATH})
ELSE() ELSE()
MESSAGE(WARNING "macOS 10.9 SDK not found, expect badness!") MESSAGE(WARNING "macOS 10.9 SDK not found - proceeding with the default SDK. This may cause issues!")
SET(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
ENDIF() ENDIF()
MESSAGE(STATUS "Using macOS SDK at ${CMAKE_OSX_SYSROOT}") MESSAGE(STATUS "Using macOS SDK at ${CMAKE_OSX_SYSROOT}")
SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) SET(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
@ -19,6 +19,8 @@ IF(APPLE)
ADD_COMPILE_OPTIONS(-Werror=partial-availability) ADD_COMPILE_OPTIONS(-Werror=partial-availability)
ENDIF() ENDIF()
PROJECT(VVVVVV)
# Compiler Flags # Compiler Flags
ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_DEFAULT=0 -DPHYSFS_SUPPORTS_ZIP=1) ADD_DEFINITIONS(-DPHYSFS_SUPPORTS_DEFAULT=0 -DPHYSFS_SUPPORTS_ZIP=1)

1
desktop_version/CONTRIBUTORS.txt
View file

@ -4,6 +4,7 @@ Contributors
(Ordered alphabetically by last name.) (Ordered alphabetically by last name.)
* Christoph Böhmwalder (@chrboe) * Christoph Böhmwalder (@chrboe)
* Charlie Bruce (@charliebruce)
* Brian Callahan (@ibara) * Brian Callahan (@ibara)
* Daniel Lee (@ddm999) * Daniel Lee (@ddm999)
* Elliott Saltar (@eboyblue3) * Elliott Saltar (@eboyblue3)

12
desktop_version/src/Graphics.cpp
View file

@ -105,15 +105,15 @@ Graphics::Graphics()
// initialize everything else to zero // initialize everything else to zero
backBuffer = nullptr; backBuffer = nullptr;
backboxrect = SDL_Rect{ 0, 0, 0, 0 }; backboxrect.x = 0, backboxrect.y = 0, backboxrect.w = 0, backboxrect.h = 0;
bcol = 0; bcol = 0;
bcol2 = 0; bcol2 = 0;
ct = colourTransform{ 0 }; ct.colour = 0;
foot_rect = SDL_Rect{ 0, 0, 0, 0 }; foot_rect.x = 0, foot_rect.y = 0, foot_rect.w = 0, foot_rect.h = 0;
foregrounddrawn = false; foregrounddrawn = false;
foregroundBuffer = nullptr; foregroundBuffer = nullptr;
backgrounddrawn = false; backgrounddrawn = false;
images_rect = SDL_Rect{ 0, 0, 0, 0 }; images_rect.x = 0, images_rect.y = 0, images_rect.w = 0, images_rect.h = 0;
j = 0; j = 0;
k = 0; k = 0;
m = 0; m = 0;
@ -121,12 +121,12 @@ Graphics::Graphics()
menubuffer = nullptr; menubuffer = nullptr;
screenbuffer = nullptr; screenbuffer = nullptr;
tempBuffer = nullptr; tempBuffer = nullptr;
tl = point{ 0, 0 }; tl.x = 0, tl.y = 0;
towerbuffer = nullptr; towerbuffer = nullptr;
trinketr = 0; trinketr = 0;
trinketg = 0; trinketg = 0;
trinketb = 0; trinketb = 0;
warprect = SDL_Rect{ 0, 0, 0, 0 }; warprect.x = 0, warprect.y = 0, warprect.w = 0, warprect.h = 0;
} }
Graphics::~Graphics() Graphics::~Graphics()