mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Fix mixed indentation in Game.cpp and Game.h
This removes all indentation that suddenly switches in the middle of a function. Most particularly egregious offenses are the ones made by the person who has 2-wide tabs, but keeps tabbing up to make each indentation level match up with the 4-wide spaces, so to them (and only them) it will look just fine, but since by default tabstop is 8-wide, their lines are pushed off all the way to the right.
This commit is contained in:
Misa
Ethan Lee
parent
12d5433efc
commit
88c16cdae8
2 changed files with 278 additions and 278 deletions
|
|
@ -39,77 +39,77 @@ const char* BoolToString(bool _b)
|
||||||
|
|
||||||
bool GetButtonFromString(const char *pText, SDL_GameControllerButton *button)
|
bool GetButtonFromString(const char *pText, SDL_GameControllerButton *button)
|
||||||
{
|
{
|
||||||
if ( *pText == '0' ||
|
if (*pText == '0' ||
|
||||||
*pText == 'a' ||
|
*pText == 'a' ||
|
||||||
*pText == 'A' )
|
*pText == 'A')
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_A;
|
*button = SDL_CONTROLLER_BUTTON_A;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( strcmp(pText, "1") == 0 ||
|
if (strcmp(pText, "1") == 0 ||
|
||||||
*pText == 'b' ||
|
*pText == 'b' ||
|
||||||
*pText == 'B' )
|
*pText == 'B')
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_B;
|
*button = SDL_CONTROLLER_BUTTON_B;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '2' ||
|
if (*pText == '2' ||
|
||||||
*pText == 'x' ||
|
*pText == 'x' ||
|
||||||
*pText == 'X' )
|
*pText == 'X')
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_X;
|
*button = SDL_CONTROLLER_BUTTON_X;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '3' ||
|
if (*pText == '3' ||
|
||||||
*pText == 'y' ||
|
*pText == 'y' ||
|
||||||
*pText == 'Y' )
|
*pText == 'Y')
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_Y;
|
*button = SDL_CONTROLLER_BUTTON_Y;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '4' ||
|
if (*pText == '4' ||
|
||||||
strcasecmp(pText, "BACK") == 0 )
|
strcasecmp(pText, "BACK") == 0)
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_BACK;
|
*button = SDL_CONTROLLER_BUTTON_BACK;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '5' ||
|
if (*pText == '5' ||
|
||||||
strcasecmp(pText, "GUIDE") == 0 )
|
strcasecmp(pText, "GUIDE") == 0)
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_GUIDE;
|
*button = SDL_CONTROLLER_BUTTON_GUIDE;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '6' ||
|
if (*pText == '6' ||
|
||||||
strcasecmp(pText, "START") == 0 )
|
strcasecmp(pText, "START") == 0)
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_START;
|
*button = SDL_CONTROLLER_BUTTON_START;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '7' ||
|
if (*pText == '7' ||
|
||||||
strcasecmp(pText, "LS") == 0 )
|
strcasecmp(pText, "LS") == 0)
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_LEFTSTICK;
|
*button = SDL_CONTROLLER_BUTTON_LEFTSTICK;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '8' ||
|
if (*pText == '8' ||
|
||||||
strcasecmp(pText, "RS") == 0 )
|
strcasecmp(pText, "RS") == 0)
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_RIGHTSTICK;
|
*button = SDL_CONTROLLER_BUTTON_RIGHTSTICK;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( *pText == '9' ||
|
if (*pText == '9' ||
|
||||||
strcasecmp(pText, "LB") == 0 )
|
strcasecmp(pText, "LB") == 0)
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
|
*button = SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if ( strcmp(pText, "10") == 0 ||
|
if (strcmp(pText, "10") == 0 ||
|
||||||
strcasecmp(pText, "RB") == 0 )
|
strcasecmp(pText, "RB") == 0)
|
||||||
{
|
{
|
||||||
*button = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;
|
*button = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -124,7 +124,7 @@ void Game::init(void)
|
||||||
|
|
||||||
timerStartTime= SDL_GetTicks();
|
timerStartTime= SDL_GetTicks();
|
||||||
|
|
||||||
glitchrunkludge = false;
|
glitchrunkludge = false;
|
||||||
hascontrol = true;
|
hascontrol = true;
|
||||||
jumpheld = false;
|
jumpheld = false;
|
||||||
advancetext = false;
|
advancetext = false;
|
||||||
|
|
@ -195,8 +195,8 @@ void Game::init(void)
|
||||||
useLinearFilter = false;
|
useLinearFilter = false;
|
||||||
advanced_mode = false;
|
advanced_mode = false;
|
||||||
fullScreenEffect_badSignal = false;
|
fullScreenEffect_badSignal = false;
|
||||||
// 0..5
|
// 0..5
|
||||||
controllerSensitivity = 2;
|
controllerSensitivity = 2;
|
||||||
|
|
||||||
nodeathmode = false;
|
nodeathmode = false;
|
||||||
nocutscenes = false;
|
nocutscenes = false;
|
||||||
|
|
@ -696,9 +696,9 @@ void Game::updatestate()
|
||||||
int i;
|
int i;
|
||||||
statedelay--;
|
statedelay--;
|
||||||
if(statedelay<=0){
|
if(statedelay<=0){
|
||||||
statedelay=0;
|
statedelay=0;
|
||||||
glitchrunkludge=false;
|
glitchrunkludge=false;
|
||||||
}
|
}
|
||||||
if (statedelay <= 0)
|
if (statedelay <= 0)
|
||||||
{
|
{
|
||||||
switch(state)
|
switch(state)
|
||||||
|
|
@ -1387,14 +1387,14 @@ void Game::updatestate()
|
||||||
if (timetrialrank > bestrank[timetriallevel] || bestrank[timetriallevel]==-1)
|
if (timetrialrank > bestrank[timetriallevel] || bestrank[timetriallevel]==-1)
|
||||||
{
|
{
|
||||||
bestrank[timetriallevel] = timetrialrank;
|
bestrank[timetriallevel] = timetrialrank;
|
||||||
if(timetrialrank>=3){
|
if(timetrialrank>=3){
|
||||||
if(timetriallevel==0) NETWORK_unlockAchievement("vvvvvvtimetrial_station1_fixed");
|
if(timetriallevel==0) NETWORK_unlockAchievement("vvvvvvtimetrial_station1_fixed");
|
||||||
if(timetriallevel==1) NETWORK_unlockAchievement("vvvvvvtimetrial_lab_fixed");
|
if(timetriallevel==1) NETWORK_unlockAchievement("vvvvvvtimetrial_lab_fixed");
|
||||||
if(timetriallevel==2) NETWORK_unlockAchievement("vvvvvvtimetrial_tower_fixed");
|
if(timetriallevel==2) NETWORK_unlockAchievement("vvvvvvtimetrial_tower_fixed");
|
||||||
if(timetriallevel==3) NETWORK_unlockAchievement("vvvvvvtimetrial_station2_fixed");
|
if(timetriallevel==3) NETWORK_unlockAchievement("vvvvvvtimetrial_station2_fixed");
|
||||||
if(timetriallevel==4) NETWORK_unlockAchievement("vvvvvvtimetrial_warp_fixed");
|
if(timetriallevel==4) NETWORK_unlockAchievement("vvvvvvtimetrial_warp_fixed");
|
||||||
if(timetriallevel==5) NETWORK_unlockAchievement("vvvvvvtimetrial_final_fixed");
|
if(timetriallevel==5) NETWORK_unlockAchievement("vvvvvvtimetrial_final_fixed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
savestats();
|
savestats();
|
||||||
|
|
@ -3094,7 +3094,7 @@ void Game::updatestate()
|
||||||
break;
|
break;
|
||||||
case 3501:
|
case 3501:
|
||||||
//Game complete!
|
//Game complete!
|
||||||
NETWORK_unlockAchievement("vvvvvvgamecomplete");
|
NETWORK_unlockAchievement("vvvvvvgamecomplete");
|
||||||
unlocknum(5);
|
unlocknum(5);
|
||||||
crewstats[0] = true;
|
crewstats[0] = true;
|
||||||
state++;
|
state++;
|
||||||
|
|
@ -3234,7 +3234,7 @@ void Game::updatestate()
|
||||||
if (obj.flags[73] == 0)
|
if (obj.flags[73] == 0)
|
||||||
{
|
{
|
||||||
//flip mode complete
|
//flip mode complete
|
||||||
NETWORK_unlockAchievement("vvvvvvgamecompleteflip");
|
NETWORK_unlockAchievement("vvvvvvgamecompleteflip");
|
||||||
unlock[19] = true;
|
unlock[19] = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3250,26 +3250,26 @@ void Game::updatestate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bestgamedeaths > -1) {
|
if (bestgamedeaths > -1) {
|
||||||
if (bestgamedeaths <= 500) {
|
if (bestgamedeaths <= 500) {
|
||||||
NETWORK_unlockAchievement("vvvvvvcomplete500");
|
NETWORK_unlockAchievement("vvvvvvcomplete500");
|
||||||
}
|
}
|
||||||
if (bestgamedeaths <= 250) {
|
if (bestgamedeaths <= 250) {
|
||||||
NETWORK_unlockAchievement("vvvvvvcomplete250");
|
NETWORK_unlockAchievement("vvvvvvcomplete250");
|
||||||
}
|
}
|
||||||
if (bestgamedeaths <= 100) {
|
if (bestgamedeaths <= 100) {
|
||||||
NETWORK_unlockAchievement("vvvvvvcomplete100");
|
NETWORK_unlockAchievement("vvvvvvcomplete100");
|
||||||
}
|
}
|
||||||
if (bestgamedeaths <= 50) {
|
if (bestgamedeaths <= 50) {
|
||||||
NETWORK_unlockAchievement("vvvvvvcomplete50");
|
NETWORK_unlockAchievement("vvvvvvcomplete50");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
savestats();
|
savestats();
|
||||||
if (nodeathmode)
|
if (nodeathmode)
|
||||||
{
|
{
|
||||||
NETWORK_unlockAchievement("vvvvvvmaster"); //bloody hell
|
NETWORK_unlockAchievement("vvvvvvmaster"); //bloody hell
|
||||||
unlock[20] = true;
|
unlock[20] = true;
|
||||||
state = 3520;
|
state = 3520;
|
||||||
statedelay = 0;
|
statedelay = 0;
|
||||||
|
|
@ -4353,24 +4353,24 @@ void Game::loadstats()
|
||||||
fullscreen = atoi(pText);
|
fullscreen = atoi(pText);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "stretch")
|
if (pKey == "stretch")
|
||||||
{
|
{
|
||||||
stretchMode = atoi(pText);
|
stretchMode = atoi(pText);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "useLinearFilter")
|
if (pKey == "useLinearFilter")
|
||||||
{
|
{
|
||||||
useLinearFilter = atoi(pText);
|
useLinearFilter = atoi(pText);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "window_width")
|
if (pKey == "window_width")
|
||||||
{
|
{
|
||||||
width = atoi(pText);
|
width = atoi(pText);
|
||||||
}
|
}
|
||||||
if (pKey == "window_height")
|
if (pKey == "window_height")
|
||||||
{
|
{
|
||||||
height = atoi(pText);
|
height = atoi(pText);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (pKey == "noflashingmode")
|
if (pKey == "noflashingmode")
|
||||||
|
|
@ -4438,13 +4438,13 @@ void Game::loadstats()
|
||||||
graphics.screenbuffer->badSignalEffect = fullScreenEffect_badSignal;
|
graphics.screenbuffer->badSignalEffect = fullScreenEffect_badSignal;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "usingmmmmmm")
|
if (pKey == "usingmmmmmm")
|
||||||
{
|
{
|
||||||
if(atoi(pText)>0){
|
if(atoi(pText)>0){
|
||||||
usingmmmmmm = 1;
|
usingmmmmmm = 1;
|
||||||
}else{
|
}else{
|
||||||
usingmmmmmm = 0;
|
usingmmmmmm = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "skipfakeload")
|
if (pKey == "skipfakeload")
|
||||||
|
|
@ -4467,37 +4467,37 @@ void Game::loadstats()
|
||||||
graphics.showmousecursor = atoi(pText);
|
graphics.showmousecursor = atoi(pText);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "flipButton")
|
if (pKey == "flipButton")
|
||||||
{
|
{
|
||||||
SDL_GameControllerButton newButton;
|
SDL_GameControllerButton newButton;
|
||||||
if (GetButtonFromString(pText, &newButton))
|
if (GetButtonFromString(pText, &newButton))
|
||||||
{
|
{
|
||||||
controllerButton_flip.push_back(newButton);
|
controllerButton_flip.push_back(newButton);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "enterButton")
|
if (pKey == "enterButton")
|
||||||
{
|
{
|
||||||
SDL_GameControllerButton newButton;
|
SDL_GameControllerButton newButton;
|
||||||
if (GetButtonFromString(pText, &newButton))
|
if (GetButtonFromString(pText, &newButton))
|
||||||
{
|
{
|
||||||
controllerButton_map.push_back(newButton);
|
controllerButton_map.push_back(newButton);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "escButton")
|
if (pKey == "escButton")
|
||||||
{
|
{
|
||||||
SDL_GameControllerButton newButton;
|
SDL_GameControllerButton newButton;
|
||||||
if (GetButtonFromString(pText, &newButton))
|
if (GetButtonFromString(pText, &newButton))
|
||||||
{
|
{
|
||||||
controllerButton_esc.push_back(newButton);
|
controllerButton_esc.push_back(newButton);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pKey == "controllerSensitivity")
|
if (pKey == "controllerSensitivity")
|
||||||
{
|
{
|
||||||
controllerSensitivity = atoi(pText);
|
controllerSensitivity = atoi(pText);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -4715,9 +4715,9 @@ void Game::savestats()
|
||||||
dataNode->LinkEndChild(msg);
|
dataNode->LinkEndChild(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
msg = new TiXmlElement( "controllerSensitivity" );
|
msg = new TiXmlElement( "controllerSensitivity" );
|
||||||
msg->LinkEndChild( new TiXmlText( tu.String(controllerSensitivity).c_str()));
|
msg->LinkEndChild( new TiXmlText( tu.String(controllerSensitivity).c_str()));
|
||||||
dataNode->LinkEndChild( msg );
|
dataNode->LinkEndChild( msg );
|
||||||
|
|
||||||
FILESYSTEM_saveTiXmlDocument("saves/unlock.vvv", &doc);
|
FILESYSTEM_saveTiXmlDocument("saves/unlock.vvv", &doc);
|
||||||
}
|
}
|
||||||
|
|
@ -5108,7 +5108,7 @@ void Game::loadquick()
|
||||||
else if (pKey == "frames")
|
else if (pKey == "frames")
|
||||||
{
|
{
|
||||||
frames = atoi(pText);
|
frames = atoi(pText);
|
||||||
frames = 0;
|
frames = 0;
|
||||||
}
|
}
|
||||||
else if (pKey == "seconds")
|
else if (pKey == "seconds")
|
||||||
{
|
{
|
||||||
|
|
@ -5376,7 +5376,7 @@ void Game::customloadquick(std::string savfile)
|
||||||
else if (pKey == "frames")
|
else if (pKey == "frames")
|
||||||
{
|
{
|
||||||
frames = atoi(pText);
|
frames = atoi(pText);
|
||||||
frames = 0;
|
frames = 0;
|
||||||
}
|
}
|
||||||
else if (pKey == "seconds")
|
else if (pKey == "seconds")
|
||||||
{
|
{
|
||||||
|
|
@ -6585,7 +6585,7 @@ void Game::loadtele()
|
||||||
else if (pKey == "frames")
|
else if (pKey == "frames")
|
||||||
{
|
{
|
||||||
frames = atoi(pText);
|
frames = atoi(pText);
|
||||||
frames = 0;
|
frames = 0;
|
||||||
}
|
}
|
||||||
else if (pKey == "seconds")
|
else if (pKey == "seconds")
|
||||||
{
|
{
|
||||||
|
|
@ -6662,25 +6662,25 @@ void Game::gameclock()
|
||||||
/*
|
/*
|
||||||
test = true;
|
test = true;
|
||||||
std::ostringstream os;
|
std::ostringstream os;
|
||||||
os << hours << ":" << minutes << ":" << seconds << ", " << frames;
|
os << hours << ":" << minutes << ":" << seconds << ", " << frames;
|
||||||
teststring = os.str();
|
teststring = os.str();
|
||||||
*/
|
*/
|
||||||
frames++;
|
frames++;
|
||||||
if (frames >= 30)
|
if (frames >= 30)
|
||||||
{
|
{
|
||||||
frames -= 30;
|
frames -= 30;
|
||||||
seconds++;
|
seconds++;
|
||||||
if (seconds >= 60)
|
if (seconds >= 60)
|
||||||
{
|
{
|
||||||
seconds -= 60;
|
seconds -= 60;
|
||||||
minutes++;
|
minutes++;
|
||||||
if (minutes >= 60)
|
if (minutes >= 60)
|
||||||
{
|
{
|
||||||
minutes -= 60;
|
minutes -= 60;
|
||||||
hours++;
|
hours++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Game::giventimestring( int hrs, int min, int sec )
|
std::string Game::giventimestring( int hrs, int min, int sec )
|
||||||
|
|
@ -6763,56 +6763,56 @@ void Game::createmenu( std::string t )
|
||||||
|
|
||||||
if (t == "mainmenu")
|
if (t == "mainmenu")
|
||||||
{
|
{
|
||||||
#if defined(MAKEANDPLAY)
|
#if defined(MAKEANDPLAY)
|
||||||
menuoptions[0] = "player levels";
|
menuoptions[0] = "player levels";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "graphic options";
|
menuoptions[1] = "graphic options";
|
||||||
menuoptionsactive[1] = true;
|
menuoptionsactive[1] = true;
|
||||||
menuoptions[2] = "game options";
|
menuoptions[2] = "game options";
|
||||||
menuoptionsactive[2] = true;
|
menuoptionsactive[2] = true;
|
||||||
menuoptions[3] = "quit game";
|
menuoptions[3] = "quit game";
|
||||||
menuoptionsactive[3] = true;
|
menuoptionsactive[3] = true;
|
||||||
nummenuoptions = 4;
|
nummenuoptions = 4;
|
||||||
menuxoff = -16;
|
menuxoff = -16;
|
||||||
menuyoff = -10;
|
menuyoff = -10;
|
||||||
#elif !defined(MAKEANDPLAY)
|
#elif !defined(MAKEANDPLAY)
|
||||||
#if defined(NO_CUSTOM_LEVELS)
|
#if defined(NO_CUSTOM_LEVELS)
|
||||||
menuoptions[0] = "start game";
|
menuoptions[0] = "start game";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "graphic options";
|
menuoptions[1] = "graphic options";
|
||||||
menuoptionsactive[1] = true;
|
menuoptionsactive[1] = true;
|
||||||
menuoptions[2] = "game options";
|
menuoptions[2] = "game options";
|
||||||
menuoptionsactive[2] = true;
|
menuoptionsactive[2] = true;
|
||||||
menuoptions[3] = "view credits";
|
menuoptions[3] = "view credits";
|
||||||
menuoptionsactive[3] = true;
|
menuoptionsactive[3] = true;
|
||||||
menuoptions[4] = "quit game";
|
menuoptions[4] = "quit game";
|
||||||
menuoptionsactive[4] = true;
|
menuoptionsactive[4] = true;
|
||||||
nummenuoptions = 5;
|
nummenuoptions = 5;
|
||||||
menuxoff = -16;
|
menuxoff = -16;
|
||||||
menuyoff = -10;
|
menuyoff = -10;
|
||||||
#else
|
#else
|
||||||
menuoptions[0] = "start game";
|
menuoptions[0] = "start game";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "player levels";
|
menuoptions[1] = "player levels";
|
||||||
menuoptionsactive[1] = true;
|
menuoptionsactive[1] = true;
|
||||||
menuoptions[2] = "graphic options";
|
menuoptions[2] = "graphic options";
|
||||||
menuoptionsactive[2] = true;
|
menuoptionsactive[2] = true;
|
||||||
menuoptions[3] = "game options";
|
menuoptions[3] = "game options";
|
||||||
menuoptionsactive[3] = true;
|
menuoptionsactive[3] = true;
|
||||||
menuoptions[4] = "view credits";
|
menuoptions[4] = "view credits";
|
||||||
menuoptionsactive[4] = true;
|
menuoptionsactive[4] = true;
|
||||||
menuoptions[5] = "quit game";
|
menuoptions[5] = "quit game";
|
||||||
menuoptionsactive[5] = true;
|
menuoptionsactive[5] = true;
|
||||||
nummenuoptions = 6;
|
nummenuoptions = 6;
|
||||||
menuxoff = -16;
|
menuxoff = -16;
|
||||||
menuyoff = -10;
|
menuyoff = -10;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#if !defined(NO_CUSTOM_LEVELS)
|
#if !defined(NO_CUSTOM_LEVELS)
|
||||||
else if (t == "playerworlds")
|
else if (t == "playerworlds")
|
||||||
{
|
{
|
||||||
#if !defined(NO_EDITOR)
|
#if !defined(NO_EDITOR)
|
||||||
menuoptions[0] = "play a level";
|
menuoptions[0] = "play a level";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "level editor";
|
menuoptions[1] = "level editor";
|
||||||
|
|
@ -6824,7 +6824,7 @@ void Game::createmenu( std::string t )
|
||||||
nummenuoptions = 3;
|
nummenuoptions = 3;
|
||||||
menuxoff = -30;
|
menuxoff = -30;
|
||||||
menuyoff = -40;
|
menuyoff = -40;
|
||||||
#else
|
#else
|
||||||
menuoptions[0] = "play a level";
|
menuoptions[0] = "play a level";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "back to menu";
|
menuoptions[1] = "back to menu";
|
||||||
|
|
@ -6832,7 +6832,7 @@ void Game::createmenu( std::string t )
|
||||||
nummenuoptions = 2;
|
nummenuoptions = 2;
|
||||||
menuxoff = -30;
|
menuxoff = -30;
|
||||||
menuyoff = -40;
|
menuyoff = -40;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (t == "levellist")
|
else if (t == "levellist")
|
||||||
{
|
{
|
||||||
|
|
@ -7069,34 +7069,34 @@ void Game::createmenu( std::string t )
|
||||||
}
|
}
|
||||||
else if (t == "options")
|
else if (t == "options")
|
||||||
{
|
{
|
||||||
#if defined(MAKEANDPLAY)
|
#if defined(MAKEANDPLAY)
|
||||||
menuoptions[0] = "accessibility options";
|
menuoptions[0] = "accessibility options";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "game pad options";
|
menuoptions[1] = "game pad options";
|
||||||
menuoptionsactive[1] = true;
|
menuoptionsactive[1] = true;
|
||||||
menuoptions[2] = "clear data";
|
menuoptions[2] = "clear data";
|
||||||
menuoptionsactive[2] = true;
|
menuoptionsactive[2] = true;
|
||||||
menuoptions[3] = "return";
|
menuoptions[3] = "return";
|
||||||
menuoptionsactive[3] = true;
|
menuoptionsactive[3] = true;
|
||||||
nummenuoptions = 4;
|
nummenuoptions = 4;
|
||||||
menuxoff = -40;
|
menuxoff = -40;
|
||||||
menuyoff = 0;
|
menuyoff = 0;
|
||||||
#elif !defined(MAKEANDPLAY)
|
#elif !defined(MAKEANDPLAY)
|
||||||
menuoptions[0] = "accessibility options";
|
menuoptions[0] = "accessibility options";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "unlock play modes";
|
menuoptions[1] = "unlock play modes";
|
||||||
menuoptionsactive[1] = true;
|
menuoptionsactive[1] = true;
|
||||||
menuoptions[2] = "game pad options";
|
menuoptions[2] = "game pad options";
|
||||||
menuoptionsactive[2] = true;
|
menuoptionsactive[2] = true;
|
||||||
menuoptions[3] = "clear data";
|
menuoptions[3] = "clear data";
|
||||||
menuoptionsactive[3] = true;
|
menuoptionsactive[3] = true;
|
||||||
|
|
||||||
menuoptions[4] = "return";
|
menuoptions[4] = "return";
|
||||||
menuoptionsactive[4] = true;
|
menuoptionsactive[4] = true;
|
||||||
nummenuoptions = 5;
|
nummenuoptions = 5;
|
||||||
menuxoff = -40;
|
menuxoff = -40;
|
||||||
menuyoff = 0;
|
menuyoff = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (t == "accessibility")
|
else if (t == "accessibility")
|
||||||
{
|
{
|
||||||
|
|
@ -7120,22 +7120,22 @@ void Game::createmenu( std::string t )
|
||||||
menuxoff = -85;
|
menuxoff = -85;
|
||||||
menuyoff = -10;
|
menuyoff = -10;
|
||||||
}
|
}
|
||||||
else if(t == "controller")
|
else if(t == "controller")
|
||||||
{
|
{
|
||||||
menuoptions[0] = "analog stick sensitivity";
|
menuoptions[0] = "analog stick sensitivity";
|
||||||
menuoptionsactive[0] = true;
|
menuoptionsactive[0] = true;
|
||||||
menuoptions[1] = "bind flip";
|
menuoptions[1] = "bind flip";
|
||||||
menuoptionsactive[1] = true;
|
menuoptionsactive[1] = true;
|
||||||
menuoptions[2] = "bind enter";
|
menuoptions[2] = "bind enter";
|
||||||
menuoptionsactive[2] = true;
|
menuoptionsactive[2] = true;
|
||||||
menuoptions[3] = "bind menu";
|
menuoptions[3] = "bind menu";
|
||||||
menuoptionsactive[3] = true;
|
menuoptionsactive[3] = true;
|
||||||
menuoptions[4] = "return";
|
menuoptions[4] = "return";
|
||||||
menuoptionsactive[4] = true;
|
menuoptionsactive[4] = true;
|
||||||
nummenuoptions = 5;
|
nummenuoptions = 5;
|
||||||
menuxoff = -40;
|
menuxoff = -40;
|
||||||
menuyoff = 10;
|
menuyoff = 10;
|
||||||
}
|
}
|
||||||
else if (t == "cleardatamenu")
|
else if (t == "cleardatamenu")
|
||||||
{
|
{
|
||||||
menuoptions[0] = "no! don't delete";
|
menuoptions[0] = "no! don't delete";
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ public:
|
||||||
|
|
||||||
void initteleportermode();
|
void initteleportermode();
|
||||||
|
|
||||||
std::string saveFilePath;
|
std::string saveFilePath;
|
||||||
|
|
||||||
|
|
||||||
int door_left;
|
int door_left;
|
||||||
|
|
@ -111,9 +111,9 @@ public:
|
||||||
//State logic stuff
|
//State logic stuff
|
||||||
int state, statedelay;
|
int state, statedelay;
|
||||||
|
|
||||||
bool glitchrunkludge;
|
bool glitchrunkludge;
|
||||||
|
|
||||||
int usingmmmmmm;
|
int usingmmmmmm;
|
||||||
|
|
||||||
int gamestate;
|
int gamestate;
|
||||||
bool hascontrol, jumpheld;
|
bool hascontrol, jumpheld;
|
||||||
|
|
@ -123,10 +123,10 @@ public:
|
||||||
bool infocus;
|
bool infocus;
|
||||||
bool muted;
|
bool muted;
|
||||||
int mutebutton;
|
int mutebutton;
|
||||||
private:
|
private:
|
||||||
float m_globalVol;
|
float m_globalVol;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
int tapleft, tapright;
|
int tapleft, tapright;
|
||||||
|
|
||||||
|
|
@ -136,7 +136,7 @@ public:
|
||||||
//public var crewstats:Array = new Array();
|
//public var crewstats:Array = new Array();
|
||||||
int lastsaved;
|
int lastsaved;
|
||||||
int deathcounts;
|
int deathcounts;
|
||||||
int timerStartTime;
|
int timerStartTime;
|
||||||
|
|
||||||
int frames, seconds, minutes, hours;
|
int frames, seconds, minutes, hours;
|
||||||
bool gamesaved;
|
bool gamesaved;
|
||||||
|
|
@ -282,9 +282,9 @@ public:
|
||||||
|
|
||||||
bool advanced_mode;
|
bool advanced_mode;
|
||||||
bool fullScreenEffect_badSignal;
|
bool fullScreenEffect_badSignal;
|
||||||
bool useLinearFilter;
|
bool useLinearFilter;
|
||||||
int stretchMode;
|
int stretchMode;
|
||||||
int controllerSensitivity;
|
int controllerSensitivity;
|
||||||
|
|
||||||
//Screenrecording stuff, for beta/trailer
|
//Screenrecording stuff, for beta/trailer
|
||||||
int recording;
|
int recording;
|
||||||
|
|
@ -327,9 +327,9 @@ public:
|
||||||
bool customlevelstatsloaded;
|
bool customlevelstatsloaded;
|
||||||
|
|
||||||
|
|
||||||
std::vector<SDL_GameControllerButton> controllerButton_map;
|
std::vector<SDL_GameControllerButton> controllerButton_map;
|
||||||
std::vector<SDL_GameControllerButton> controllerButton_flip;
|
std::vector<SDL_GameControllerButton> controllerButton_flip;
|
||||||
std::vector<SDL_GameControllerButton> controllerButton_esc;
|
std::vector<SDL_GameControllerButton> controllerButton_esc;
|
||||||
|
|
||||||
bool skipfakeload;
|
bool skipfakeload;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue