Merge remote-tracking branch 'upstream/master' into upstream-ci

Fix conflict:
	.github/workflows/ci.yml

Author: Daaaav

.github/workflows/ci.yml

@@ -33,11 +33,40 @@ jobs:
       if: startsWith(matrix.os, 'macos')
       run: brew install ninja sdl2 sdl2_mixer
 
-    - name: CMake configure
+    - name: CMake configure (default version)
       run: |
         mkdir ${SRC_DIR_PATH}/build && cd ${SRC_DIR_PATH}/build
         cmake -GNinja ..
-    - name: Build
+    - name: Build (default version)
+      run: ninja -C ${SRC_DIR_PATH}/build
+
+    - name: CMake configure (official)
+      run: |
+        cd ${SRC_DIR_PATH}/build
+        cmake -DOFFICIAL_BUILD=ON ..
+    - name: Build (official)
+      run: |
+        ninja -C ${SRC_DIR_PATH}/build
+
+    - name: CMake configure (M&P)
+      run: |
+        cd ${SRC_DIR_PATH}/build
+        cmake -DOFFICIAL_BUILD=OFF -DMAKEANDPLAY=ON ..
+    - name: Build (M&P)
+      run: ninja -C ${SRC_DIR_PATH}/build
+
+    - name: CMake configure (no custom levels)
+      run: |
+        cd ${SRC_DIR_PATH}/build
+        cmake -DMAKEANDPLAY=OFF -DCUSTOM_LEVEL_SUPPORT=DISABLED ..
+    - name: Build (no custom levels)
+      run: ninja -C ${SRC_DIR_PATH}/build
+
+    - name: CMake configure (no editor)
+      run: |
+        cd ${SRC_DIR_PATH}/build
+        cmake -DCUSTOM_LEVEL_SUPPORT=NO_EDITOR ..
+    - name: Build (no editor)
       run: ninja -C ${SRC_DIR_PATH}/build
 
 

License exceptions.md

@@ -13,6 +13,7 @@ VVVVVV's source code is made available under a [custom license](LICENSE.md), whi
 | cursed_vvvvvv.exe | [MustardBucket](https://twitter.com/mustard_bucket/) | Modified version of VVVVVV where instead of flipping gravity you jump normally, can jump multiple times, and wall jump. | Make it impossible to revert to ordinary flipping behaviour. | [download](https://mustardbucket.itch.io/cursed-vvvvvv?secret=O0KvS02wD473pXBF9avreZsww), [twitter gif](https://twitter.com/mustard_bucket/status/1216272971779670016) |
 | Haiku Port | [Julius C. Enriquez](https://github.com/win8linux) | Port for the Haiku operating system. | Display the following text in the Haiku package to make it clear that this is an exception: "VVVVVV is a commercial game! The author has given special permission to make this Haiku version available for free. If you enjoy the game, please consider purchasing a copy at [thelettervsixtim.es](http://thelettervsixtim.es)." | [haiku recipe](https://github.com/haikuports/haikuports/tree/master/games-arcade/vvvvvv), [haiku data.zip recipe](https://github.com/haikuports/haikuports/tree/master/games-arcade/vvvvvv_data) |
 | Dreamcast Port | [Gustavo Aranda](https://github.com/gusarba/) | Port for the Sega Dreamcast. | Permission is given to distribute a ready-to-use CD image file for the Sega Dreamcast containing the data.zip assets for non commercial use only. | [github repo](https://github.com/gusarba/VVVVVVDC)|
+| XBox One/UWP Port | [tunip3](https://github.com/tunip3) | Port for XBOX ONE (DURANGO) via UWP. | Permission is given to distribute a pre-compiled package (containing the data.zip assets) for people to run on development mode xboxes, for non commercial use only. | [github repo](https://github.com/tunip3/DURANGO-V6)|
 
 In addition, the following exceptions apply for any projects that match these descriptions:
 

desktop_version/.gitignore

@@ -9,6 +9,7 @@ VVVVVV.exe
 VVVVVV
 *.a
 *.gch
+src/Version.h.out
 
 # Game data
 data.zip

desktop_version/CMakeLists.txt

@@ -13,11 +13,19 @@ SET_PROPERTY(CACHE CUSTOM_LEVEL_SUPPORT PROPERTY STRINGS ENABLED NO_EDITOR DISAB
 SET(STEAM OFF CACHE BOOL "Use the Steam API")
 SET(GOG OFF CACHE BOOL "Use the GOG API")
 
-IF(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+SET(OFFICIAL_BUILD OFF CACHE BOOL "Compile an official build of the game")
+
+SET(MAKEANDPLAY OFF CACHE BOOL "Compile a version of the game without the main campaign (provided for convenience; consider modifying MakeAndPlay.h instead")
+
+IF(OFFICIAL_BUILD AND NOT MAKEANDPLAY)
 	SET(STEAM ON)
 	SET(GOG ON)
 ENDIF()
 
+IF(MAKEANDPLAY)
+	ADD_DEFINITIONS(-DMAKEANDPLAY)
+ENDIF()
+
 # Set standard to C++98/C++03
 SET(CMAKE_CXX_STANDARD 98)
 SET(CMAKE_CXX_EXTENSIONS OFF) # prevent mixing stdlib implementations (dangerous!)
@@ -97,6 +105,7 @@ SET(VVV_SRC
 	src/Otherlevel.cpp
 	src/preloader.cpp
 	src/Render.cpp
+	src/RenderFixed.cpp
 	src/Screen.cpp
 	src/Script.cpp
 	src/Scripts.cpp
@@ -107,6 +116,7 @@ SET(VVV_SRC
 	src/Tower.cpp
 	src/UtilityClass.cpp
 	src/WarpClass.cpp
+	src/XMLUtils.cpp
 	src/main.cpp
 	src/Network.c
 )
@@ -150,6 +160,38 @@ ELSE()
 	ADD_EXECUTABLE(VVVVVV ${VVV_SRC})
 ENDIF()
 
+IF(NOT OFFICIAL_BUILD)
+	# Add interim commit hash and its date to the build
+
+	# FIND_PACKAGE sets GIT_FOUND and GIT_EXECUTABLE
+	FIND_PACKAGE(Git)
+
+	IF(GIT_FOUND)
+		# These filenames have to be qualified, because when we run
+		# the CMake script, its work dir gets set to the build folder
+		SET(VERSION_INPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/Version.h.in)
+		SET(VERSION_OUTPUT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/Version.h.out)
+
+		ADD_CUSTOM_TARGET(
+			GenerateVersion ALL
+			# This BYPRODUCTS line is required for this to be ran every time
+			BYPRODUCTS ${VERSION_OUTPUT_FILE}
+			COMMAND ${CMAKE_COMMAND}
+			# These args have to be passed through, otherwise the script can't see them
+			# Also, these args have to come BEFORE `-P`! (Otherwise it fails with an unclear error)
+			-DGIT_EXECUTABLE=${GIT_EXECUTABLE}
+			-DINPUT_FILE=${VERSION_INPUT_FILE}
+			-DOUTPUT_FILE=${VERSION_OUTPUT_FILE}
+			-P ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake
+		)
+
+		ADD_DEPENDENCIES(VVVVVV GenerateVersion)
+
+		# This lets Version.h know that Version.h.out exists
+		ADD_DEFINITIONS(-DVERSION_H_OUT_EXISTS)
+	ENDIF()
+ENDIF()
+
 # Build options
 IF(ENABLE_WARNINGS)
 	# The weird syntax is due to CMake generator expressions.
@@ -204,7 +246,7 @@ if (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES AND (MINGW OR MSYS))
 
 elseif (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES)
 	message(STATUS "Using pre-defined SDL2 variables SDL2_INCLUDE_DIRS and SDL2_LIBRARIES")
-	target_include_directories(VVVVVV PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>")
+	target_include_directories(VVVVVV SYSTEM PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>")
 	target_link_libraries(VVVVVV ${SDL2_LIBRARIES})
 else()
 	# Only try to autodetect if both SDL2 variables aren't explicitly set
@@ -218,7 +260,7 @@ else()
 	else()
 		message(STATUS "No TARGET SDL2::SDL2, or SDL2, using variables")
 		find_path(SDL2_MIXER_INCLUDE_DIRS NAMES SDL_mixer.h PATH_SUFFIXES SDL2)
-		target_include_directories(VVVVVV PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>" ${SDL2_MIXER_INCLUDE_DIRS})
+		target_include_directories(VVVVVV SYSTEM PUBLIC "$<BUILD_INTERFACE:${SDL2_INCLUDE_DIRS}>" ${SDL2_MIXER_INCLUDE_DIRS})
 		target_link_libraries(VVVVVV ${SDL2_LIBRARIES} SDL2_mixer)
 	endif()
 endif()

desktop_version/src/Ent.cpp

@@ -106,7 +106,7 @@ void entclass::setenemy( int t )
 			break;
 		case 1:
 			yp += 10;
-			oldyp += 10;
+			lerpoldyp += 10;
 			tile = 63;
 			animate = 100; //LIES
 			colour = 6;
@@ -146,9 +146,9 @@ void entclass::setenemy( int t )
 			break;
 		case 1:
 			xp += 4;
-			oldxp += 4;
+			lerpoldxp += 4;
 			yp -= 4;
-			oldyp -= 4;
+			lerpoldyp -= 4;
 			tile = 76;
 			animate = 100; // Clouds
 			colour = 6;
@@ -226,9 +226,9 @@ void entclass::setenemyroom( int rx, int ry )
 			w = 16;
 			h = 16;
 			xp -= 24;
-			oldxp -= 24;
+			lerpoldxp -= 24;
 			yp -= 16;
-			oldyp -= 16;
+			lerpoldyp -= 16;
 		}
 		else
 		{
@@ -241,9 +241,9 @@ void entclass::setenemyroom( int rx, int ry )
 			cx = 4;
 			size = 9;
 			xp -= 4;
-			oldxp -= 4;
+			lerpoldxp -= 4;
 			yp -= 32;
-			oldyp -= 32;
+			lerpoldyp -= 32;
 		}
 
 		break;
@@ -344,7 +344,7 @@ void entclass::setenemyroom( int rx, int ry )
 		w = 32;
 		h = 14;
 		yp += 1;
-		oldyp += 1;
+		lerpoldyp += 1;
 		break;
 	case rn(16, 2): // (Manequins)
 		tile = 52;
@@ -353,7 +353,7 @@ void entclass::setenemyroom( int rx, int ry )
 		w = 16;
 		h = 25;
 		yp -= 4;
-		oldyp -= 4;
+		lerpoldyp -= 4;
 		break;
 	case rn(18, 0): // (Obey)
 		tile = 51;
@@ -644,3 +644,11 @@ void entclass::updatecolour()
 		break;
 	}
 }
+
+bool entclass::ishumanoid()
+{
+	return type == 0
+		|| type == 12
+		|| type == 14
+		|| type == 55;
+}

desktop_version/src/Ent.h

@@ -20,6 +20,8 @@ class entclass
 
     void updatecolour();
 
+    bool ishumanoid();
+
 public:
     //Fundamentals
     bool invis;

desktop_version/src/Entity.cpp

@@ -2361,7 +2361,7 @@ bool entityclass::updateentities( int i )
                     {
                         return removeentity(i);
                     }
-                    if (game.roomy == 108)
+                    if (game.roomx == 113 && game.roomy == 108)
                     {
                         if (entities[i].yp <= 60)
                         {
@@ -2773,7 +2773,7 @@ bool entityclass::updateentities( int i )
                 }
 
                 //Special rules:
-                if (game.roomx == 110 && game.roomy == 105)
+                if (game.roomx == 110 && game.roomy == 105 && !map.custommode)
                 {
                     if (entities[i].xp < 155)
                     {
@@ -4674,6 +4674,11 @@ void entityclass::collisioncheck(int i, int j, bool scm /*= false*/)
         }
         break;
     case 2:   //Moving platforms
+        if (entities[j].behave >= 8 && entities[j].behave < 10)
+        {
+            //We don't want conveyors, moving platforms only
+            break;
+        }
         if (entitycollide(i, j))
         {
             //Disable collision temporarily so we don't push the person out!