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

Merge pull request #554 from InfoTeddy/general-improvements

Browse source 
Allow pressing ACTION to skip the fake loading screen
This commit is contained in:
Terry Cavanagh 2020-12-22 00:01:42 +10:30 committed by GitHub
commit 98effeee58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
desktop_version/src/main.cpp
View file

@ -527,6 +527,7 @@ void inline fixedloop()
switch(game.gamestate) switch(game.gamestate)
{ {
case PRELOADER: case PRELOADER:
preloaderinput();
preloaderrenderfixed(); preloaderrenderfixed();
break; break;
#if !defined(NO_CUSTOM_LEVELS) && !defined(NO_EDITOR) #if !defined(NO_CUSTOM_LEVELS) && !defined(NO_EDITOR)

16
desktop_version/src/preloader.cpp
View file

@ -1,6 +1,7 @@
#include "Enums.h" #include "Enums.h"
#include "Game.h" #include "Game.h"
#include "Graphics.h" #include "Graphics.h"
#include "KeyPoll.h"
#include "UtilityClass.h" #include "UtilityClass.h"
int pre_fakepercent=0, pre_transition=30; int pre_fakepercent=0, pre_transition=30;
@ -10,6 +11,21 @@ int pre_darkcol=0, pre_lightcol=0, pre_curcol=0, pre_coltimer=0, pre_offset=0;
int pre_frontrectx=30, pre_frontrecty=20, pre_frontrectw=260, pre_frontrecth=200; int pre_frontrectx=30, pre_frontrecty=20, pre_frontrectw=260, pre_frontrecth=200;
int pre_temprectx=0, pre_temprecty=0, pre_temprectw=320, pre_temprecth=240; int pre_temprectx=0, pre_temprecty=0, pre_temprectw=320, pre_temprecth=240;
void preloaderinput()
{
game.press_action = false;
if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip)) {
game.press_action = true;
}
if (game.press_action) {
//Skip to TITLEMODE immediately
game.gamestate = TITLEMODE;
game.jumpheld = true;
}
}
void preloaderrenderfixed() void preloaderrenderfixed()
{ {
if (pre_transition < 30) pre_transition--; if (pre_transition < 30) pre_transition--;

2
desktop_version/src/preloader.h
View file

@ -1,6 +1,8 @@
#ifndef PRELOADER_H #ifndef PRELOADER_H
#define PRELOADER_H #define PRELOADER_H
void preloaderinput();
void preloaderrender(); void preloaderrender();
void preloaderrenderfixed(); void preloaderrenderfixed();