mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-03 03:23:33 +02:00
Code Issues Releases Wiki Activity

Merge cb8d400637 into 1e5a737089

Browse Source
This commit is contained in:
Reese Rivers 2023-11-10 13:58:56 -07:00 committed by GitHub
commit 7da5949646
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 145 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desktop_version/lang/ca/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="assigna menú" explanation="menu option"/>
<string english="bind restart" translation="assigna reinici" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="assigna interacció" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="El gir està assignat a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="El retorn està assignat a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="El menú està assignat a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="El reinici està assignat a: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="La interacció està assignada a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ERROR: No s’ha trobat cap fitxer de llengua." explanation="" max="38*3"/>
<string english="Language folder:" translation="Carpeta de llengua:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Carpeta de llengua del repositori:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/de/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="menü zuweisen" explanation="menu option"/>
<string english="bind restart" translation="neustart zuweisen" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="interagieren zuweisen" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Flippen ist belegt mit: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Enter ist belegt mit: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menü ist belegt mit: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Neustart ist belegt mit: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interagieren ist belegt mit: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="FEHLER: keine Sprachdateien gefunden." explanation="" max="38*3"/>
<string english="Language folder:" translation="Sprachordner:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Repository-Sprachordner:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/en/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="" explanation="menu option"/>
<string english="bind restart" translation="" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="" explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="" explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="" explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="" explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="" explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="" explanation="" max="38*3"/>
<string english="Language folder:" translation="" explanation="" max="39"/>
<string english="Repository language folder:" translation="" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/eo/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="agordi menubutonon" explanation="menu option"/>
<string english="bind restart" translation="agordi rekomencbutonon" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="agordi interagbutonon" explanation="menu option"/>
<string english="toggle rumble" translation="baskuligi vibradon" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Renversiĝo agordita al: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="ENTER agordita al: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menuo agordita al: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Rekomenco agordita al: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interago agordita al: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="Vibrado" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="Ebligi aŭ malebligi regilan vibradon." explanation="" max="38*3"/>
<string english="Rumble is ON." translation="Vibrado estas ŜALTA." explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="Vibrado estas MALŜALTA." explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ERARO: Neniuj lingvodosieroj troviĝis." explanation="" max="38*3"/>
<string english="Language folder:" translation="Lingvodosierujo:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Deponeja lingvodosierujo:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/es/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="asignar menú" explanation="menu option"/>
<string english="bind restart" translation="asignar reiniciar" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="asignar interactuar" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Giro está asignado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Entrar está asignado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menú está asignado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Reinicio está asignado a: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interactuar está asignado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ERROR: No se han detectado archivos de idioma." explanation="" max="38*3"/>
<string english="Language folder:" translation="Carpeta de idioma:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Carpeta de idioma de repositorio:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/fr/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="lier menu" explanation="menu option"/>
<string english="bind restart" translation="lier recommencer" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="lier interagir" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Renverser est lié à : " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Entrer est lié à : " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menu est lié à : " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Recommencer est lié à : " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interagir est lié à : " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ERREUR : aucun fichier de langue trouvé." explanation="" max="38*3"/>
<string english="Language folder:" translation="Dossier de langue :" explanation="" max="39"/>
<string english="Repository language folder:" translation="Dossier de langue du dépôt :" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/it/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="assegna menu" explanation="menu option"/>
<string english="bind restart" translation="assegna ricomincia" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="assegna interagisci" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Capovolgi è assegnato a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Invio è assegnato a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menu è assegnato a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Ricomincia è assegnato a: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interagisci è assegnato a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ERRORE: Nessun file di lingua trovato." explanation="" max="38*3"/>
<string english="Language folder:" translation="Cartella lingue:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Cartella repository lingue:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/nl/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="menu toewijzen" explanation="menu option"/>
<string english="bind restart" translation="herstarten toewijzen" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="interactie toewijzen" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Omkeren is toegewezen aan: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Enter is toegewezen aan: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menu is toegewezen aan: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Herstarten is toegewezen aan: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interactie is toegewezen aan: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="FOUT: Geen taalbestanden gevonden." explanation="" max="38*3"/>
<string english="Language folder:" translation="Talenmap:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Talenmap van repository:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/pt_BR/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="vincular menu" explanation="menu option"/>
<string english="bind restart" translation="vincular reiniciar" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="vincular interagir" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Virar está vinculado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Confirmar está vinculado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menu está vinculado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Reiniciar está vinculado a: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interagir está vinculado a: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ERRO: Nenhum arquivo de idioma encontrado." explanation="" max="38*3"/>
<string english="Language folder:" translation="Pasta de idioma:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Pasta de idioma do repositório:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/pt_PT/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="definir menu" explanation="menu option"/>
<string english="bind restart" translation="definir reiniciar" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="definir interação" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Inversão: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Entrar: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menu: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Reiniciar: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Interação: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ERRO: Não há ficheiros de idioma." explanation="" max="38*3"/>
<string english="Language folder:" translation="Pasta de idioma:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Pasta de repositório de idioma:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/ru/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="назначить меню" explanation="menu option"/>
<string english="bind restart" translation="назначить возврат" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="назначить взаимодействие" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Переворот назначен на: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Ввод назначен на: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Меню назначено на: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Возврат назначен на: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Взаимодействие назначено на: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="ОШИБКА: Файлы локализации не обнаружены." explanation="" max="38*3"/>
<string english="Language folder:" translation="Папка локализации:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Папка локализации из репозитория:" explanation="Language folder from the Git repository" max="39"/>

5
desktop_version/lang/tr/strings.xml
View File

@ -143,11 +143,16 @@
<string english="bind menu" translation="ata - menü" explanation="menu option"/>
<string english="bind restart" translation="ata - yeniden başlatma" explanation="menu option. In-game death key to restart at checkpoint"/>
<string english="bind interact" translation="ata - etkileşim" explanation="menu option"/>
<string english="toggle rumble" translation="" explanation="menu option, controller rumble (vibration) feature"/>
<string english="Flip is bound to: " translation="Ters Dönme: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Enter is bound to: " translation="Girme: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Menu is bound to: " translation="Menü şuna atandı: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Restart is bound to: " translation="Yeniden Başlatma: " explanation="in-game death key to restart at checkpoint. Controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Interact is bound to: " translation="Etkileşim: " explanation="controller binds, bound to A, B, X, Y, etc. These strings end with a space!" max="32"/>
<string english="Rumble" translation="" explanation="title" max="20"/>
<string english="Turn gamepad rumble on or off." translation="" explanation="" max="38*3"/>
<string english="Rumble is ON." translation="" explanation="" max="38*2"/>
<string english="Rumble is OFF." translation="" explanation="" max="38*2"/>
<string english="ERROR: No language files found." translation="HATA: Dil dosyaları bulunamadı." explanation="" max="38*3"/>
<string english="Language folder:" translation="Dil klasörü:" explanation="" max="39"/>
<string english="Repository language folder:" translation="Depo dil klasörü:" explanation="Language folder from the Git repository" max="39"/>

11
desktop_version/src/Entity.cpp
View File

@ -9,6 +9,7 @@
#include "GlitchrunnerMode.h"
#include "Graphics.h"
#include "Localization.h"
#include "KeyPoll.h"
#include "Map.h"
#include "Maths.h"
#include "Music.h"
@ -2641,6 +2642,7 @@ bool entityclass::updateentities( int i )
return disableentity(i);
}
key.controllerRumble(0xCFFF,75);
break;
case 5: //Particle sprays
if (entities[i].state == 0)
@ -2689,6 +2691,7 @@ bool entityclass::updateentities( int i )
game.savestatsandsettings();
}
}
key.controllerRumble(0xBFFF,200);
return disableentity(i);
}
@ -2710,6 +2713,7 @@ bool entityclass::updateentities( int i )
entities[i].onentity = 0;
game.savepoint = entities[i].para;
music.playef(Sound_CHECKPOINT);
key.controllerRumble(0xBFFF,75);
game.savex = entities[i].xp - 4;
@ -2755,6 +2759,8 @@ bool entityclass::updateentities( int i )
music.playef(Sound_GRAVITYLINE);
key.controllerRumble(0xCFFF,75);
game.gravitycontrol = (game.gravitycontrol + 1) % 2;
game.totalflips++;
int temp = getplayer();
@ -3345,7 +3351,8 @@ bool entityclass::updateentities( int i )
if (entities[i].tile == 1)
{
music.playef(Sound_GAMESAVED);
entities[i].tile = 2;
key.controllerRumble(0xCFFF,150);
entities[i].colour = 101;
if(!game.intimetrial && !game.nodeathmode)
{
@ -4840,6 +4847,8 @@ void entityclass::collisioncheck(int i, int j, bool scm /*= false*/)
if (entityhlinecollide(i, j))
{
music.playef(Sound_GRAVITYLINE);
key.controllerRumble(0xCFFF,75);
game.gravitycontrol = (game.gravitycontrol + 1) % 2;
game.totalflips++;
if (game.gravitycontrol == 0)

12
desktop_version/src/Game.cpp
View File

@ -383,6 +383,7 @@ void Game::init(void)
disableaudiopause = false;
disabletemporaryaudiopause = true;
inputdelay = false;
rumble = false;
old_skip_message_timer = 0;
skip_message_timer = 0;
@ -4537,6 +4538,11 @@ void Game::deserializesettings(tinyxml2::XMLElement* dataNode, struct ScreenSett
inputdelay = help.Int(pText);
}
if (SDL_strcmp(pKey, "rumble") == 0)
{
rumble = help.Int(pText);
}
if (SDL_strcmp(pKey, "glitchrunnermode") == 0)
{
GlitchrunnerMode_set(GlitchrunnerMode_string_to_enum(pText));
@ -4825,6 +4831,8 @@ void Game::serializesettings(tinyxml2::XMLElement* dataNode, const struct Screen
xml::update_tag(dataNode, "inputdelay", (int) inputdelay);
xml::update_tag(dataNode, "rumble", (int) rumble);
xml::update_tag(
dataNode,
"glitchrunnermode",
@ -5058,7 +5066,8 @@ void Game::deathsequence(void)
}
deathcounts++;
music.playef(Sound_CRY);
if (INBOUNDS_VEC(i, obj.entities) && !noflashingmode)
key.controllerRumble(0xDFFF,200);
if (INBOUNDS_VEC(i, obj.entities))
{
obj.entities[i].invis = true;
}
@ -6576,6 +6585,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
option(loc::gettext("bind menu"));
option(loc::gettext("bind restart"));
option(loc::gettext("bind interact"), separate_interact);
option(loc::gettext("toggle rumble"));
option(loc::gettext("return"));
menuyoff = 0;
maxspacing = 10;

1
desktop_version/src/Game.h
View File

@ -580,6 +580,7 @@ public:
bool disableaudiopause;
bool disabletemporaryaudiopause;
bool inputdelay;
bool rumble;
bool statelocked;

8
desktop_version/src/Input.cpp
View File

@ -1852,8 +1852,14 @@ static void menuactionpress(void)
}
game.savestatsandsettings_menu();
break;
case 6:
/* Rumble */
music.playef(Sound_VIRIDIAN);
game.rumble = !game.rumble;
key.controllerRumble(0xFFFF,250);
game.savestatsandsettings_menu();
break;
case 7:
music.playef(Sound_VIRIDIAN);
game.returnmenu();
map.nexttowercolour();

23
desktop_version/src/KeyPoll.cpp
View File

@ -544,3 +544,26 @@ bool KeyPoll::controllerWantsDown(void)
{
return buttonmap[SDL_CONTROLLER_BUTTON_DPAD_DOWN] || yVel > 0;
}
int KeyPoll::controllerRumble(Uint16 intensity, Uint32 duration_ms)
{
int result = -1;
if (game.rumble)
{
std::map<SDL_JoystickID, SDL_GameController*>::iterator it;
for (it = controllers.begin(); it != controllers.end(); it++)
{
int thisController = SDL_GameControllerRumble(it->second,intensity,intensity,duration_ms);
if (result != 0)
{
result = thisController;
}
}
}
return result; // Returns -1 if rumble is off/no controller supported rumble, 0 if any controller succeeded
}
int KeyPoll::controllerRumbleStop(void)
{
return controllerRumble(0,0);
}

2
desktop_version/src/KeyPoll.h
View File

@ -61,6 +61,8 @@ public:
bool controllerWantsRight(bool includeVert);
bool controllerWantsUp(void);
bool controllerWantsDown(void);
int controllerRumble(Uint16 intensity, Uint32 duration_ms);
int controllerRumbleStop(void);
int leftbutton, rightbutton, middlebutton;
int mousex;

11
desktop_version/src/Logic.cpp
View File

@ -5,6 +5,7 @@
#include "Game.h"
#include "GlitchrunnerMode.h"
#include "Graphics.h"
#include "KeyPoll.h"
#include "Map.h"
#include "Music.h"
#include "Network.h"
@ -40,6 +41,11 @@ void titlelogic(void)
game.createmenu(game.menudest, true);
}
}
if (game.screenshake > 0)
{
key.controllerRumble(0x7FFF,10);
}
}
void maplogic(void)
@ -175,6 +181,11 @@ void gamelogic(void)
}
}
if (game.screenshake > 0)
{
key.controllerRumble(0x7FFF,10);
}
//Misc
if (map.towermode)
{

17
desktop_version/src/Render.cpp
View File

@ -648,8 +648,11 @@ static void menurender(void)
}
case Menu::controller:
{
if (game.currentmenuoption != 6)
{
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Game Pad"), tr, tg, tb);
font::print_wrap(PR_CEN, -1, 55, loc::gettext("Change controller options."), tr, tg, tb);
}
int spacing = font::height(0);
spacing = SDL_max(spacing, 10);
@ -706,6 +709,20 @@ static void menurender(void)
font::print(PR_CEN | PR_BRIGHTNESS(game.separate_interact ? 255 : 128), -1, 75+spacing*4, buffer_a, tr, tg, tb);
break;
}
case 6:
{
font::print(PR_2X | PR_CEN, -1, 30, loc::gettext("Rumble"), tr, tg, tb);
int next_y = font::print_wrap(PR_CEN, -1, 55, loc::gettext("Turn gamepad rumble on or off."), tr, tg, tb);
if (game.rumble == true)
{
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Rumble is ON."), tr, tg, tb);
}
else
{
font::print_wrap(PR_CEN, -1, next_y, loc::gettext("Rumble is OFF."), tr / 2, tg / 2, tb / 2);
}
break;
}
}

3
desktop_version/src/main.cpp
View File

@ -561,7 +561,8 @@ int main(int argc, char *argv[])
SDL_INIT_VIDEO |
SDL_INIT_AUDIO |
SDL_INIT_JOYSTICK |
SDL_INIT_GAMECONTROLLER
SDL_INIT_GAMECONTROLLER |
SDL_INIT_HAPTIC
);
if (SDL_IsTextInputActive() == SDL_TRUE)
{

2
third_party/c-hashmap vendored

@ -1 +1 @@
Subproject commit dedf70e0a769bc52a17a36da840d96770fc26d12
Subproject commit b4ca16d59f90b7ba9aa5a53ae72e34f92ed3e35d