Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-31 02:14:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Declare obj.flags a vector of bools instead of ints

Browse Source 
It's treated like a bool anyway, so might as well make it one.

This also necessitates updating every single instance where it or an
element inside it is used, too.
This commit is contained in:
Misa
2020-04-08 23:34:26 -07:00
committed by Ethan Lee
parent 2f1c400c9a
commit abfae6b4d7
13 changed files with 213 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
desktop_version/src/Script.cpp
View File

@@ -171,7 +171,7 @@ void scriptclass::run()
}
else if (words[0] == "customifflag")
{
if (obj.flags[ss_toi(words[1])]==1)
if (obj.flags[ss_toi(words[1])])
{
load("custom_"+words[2]);
position--;
@@ -194,9 +194,9 @@ void scriptclass::run()
{
if(ss_toi(words[1])>=0 && ss_toi(words[1])<100){
if(words[2]=="on"){
obj.changeflag(ss_toi(words[1]),1);
obj.changeflag(ss_toi(words[1]),true);
}else if(words[2]=="off"){
obj.changeflag(ss_toi(words[1]),0);
obj.changeflag(ss_toi(words[1]),false);
}
}
}
@@ -1305,7 +1305,7 @@ void scriptclass::run()
}
else if (words[0] == "ifflag")
{
if (obj.flags[ss_toi(words[1])]==1)
if (obj.flags[ss_toi(words[1])])
{
load(words[2]);
position--;
@@ -2039,12 +2039,12 @@ void scriptclass::run()
}
else if (words[0] == "trinketbluecontrol")
{
if (game.trinkets() == 20 && obj.flags[67] == 1)
if (game.trinkets() == 20 && obj.flags[67])
{
load("talkblue_trinket6");
position--;
}
else if (game.trinkets() >= 19 && obj.flags[67] == 0)
else if (game.trinkets() >= 19 && !obj.flags[67])
{
load("talkblue_trinket5");
position--;
@@ -2093,70 +2093,70 @@ void scriptclass::run()
position--;
}
}
else if (obj.flags[67] == 1)
else if (obj.flags[67])
{
//game complete
load("talkred_13");
position--;
}
else if (obj.flags[35] == 1 && obj.flags[52] == 0)
else if (obj.flags[35] && !obj.flags[52])
{
//Intermission level
obj.flags[52] = 1;
obj.flags[52] = true;
load("talkred_9");
position--;
}
else if (obj.flags[51] == 0)
else if (!obj.flags[51])
{
//We're back home!
obj.flags[51] = 1;
obj.flags[51] = true;
load("talkred_5");
position--;
}
else if (obj.flags[48] == 0 && game.crewstats[5])
else if (!obj.flags[48] && game.crewstats[5])
{
//Victoria's back
obj.flags[48] = 1;
obj.flags[48] = true;
load("talkred_6");
position--;
}
else if (obj.flags[49] == 0 && game.crewstats[4])
else if (!obj.flags[49] && game.crewstats[4])
{
//Verdigris' back
obj.flags[49] = 1;
obj.flags[49] = true;
load("talkred_7");
position--;
}
else if (obj.flags[50] == 0 && game.crewstats[2])
else if (!obj.flags[50] && game.crewstats[2])
{
//Vitellary's back
obj.flags[50] = 1;
obj.flags[50] = true;
load("talkred_8");
position--;
}
else if (obj.flags[45] == 0 && !game.crewstats[5])
else if (!obj.flags[45] && !game.crewstats[5])
{
obj.flags[45] = 1;
obj.flags[45] = true;
load("talkred_2");
position--;
}
else if (obj.flags[46] == 0 && !game.crewstats[4])
else if (!obj.flags[46] && !game.crewstats[4])
{
obj.flags[46] = 1;
obj.flags[46] = true;
load("talkred_3");
position--;
}
else if (obj.flags[47] == 0 && !game.crewstats[2])
else if (!obj.flags[47] && !game.crewstats[2])
{
obj.flags[47] = 1;
obj.flags[47] = true;
load("talkred_4");
position--;
}
else
{
obj.flags[45] = 0;
obj.flags[46] = 0;
obj.flags[47] = 0;
obj.flags[45] = false;
obj.flags[46] = false;
obj.flags[47] = false;
load("talkred_1");
position--;
}
@@ -2179,47 +2179,47 @@ void scriptclass::run()
load("talkgreen_9");
position--;
}
else if (obj.flags[67] == 1)
else if (obj.flags[67])
{
//game complete
load("talkgreen_10");
position--;
}
else if (obj.flags[34] == 1 && obj.flags[57] == 0)
else if (obj.flags[34] && !obj.flags[57])
{
//Intermission level
obj.flags[57] = 1;
obj.flags[57] = true;
load("talkgreen_7");
position--;
}
else if (obj.flags[53] == 0)
else if (!obj.flags[53])
{
//Home!
obj.flags[53] = 1;
obj.flags[53] = true;
load("talkgreen_6");
position--;
}
else if (obj.flags[54] == 0 && game.crewstats[2])
else if (!obj.flags[54] && game.crewstats[2])
{
obj.flags[54] = 1;
obj.flags[54] = true;
load("talkgreen_5");
position--;
}
else if (obj.flags[55] == 0 && game.crewstats[3])
else if (!obj.flags[55] && game.crewstats[3])
{
obj.flags[55] = 1;
obj.flags[55] = true;
load("talkgreen_4");
position--;
}
else if (obj.flags[56] == 0 && game.crewstats[5])
else if (!obj.flags[56] && game.crewstats[5])
{
obj.flags[56] = 1;
obj.flags[56] = true;
load("talkgreen_3");
position--;
}
else if (obj.flags[58] == 0)
else if (!obj.flags[58])
{
obj.flags[58] = 1;
obj.flags[58] = true;
load("talkgreen_2");
position--;
}
@@ -2236,20 +2236,20 @@ void scriptclass::run()
load("talkblue_9");
position--;
}
else if (obj.flags[67] == 1)
else if (obj.flags[67])
{
//game complete, everything changes for victoria
if (obj.flags[41] == 1 && obj.flags[42] == 0)
if (obj.flags[41] && !obj.flags[42])
{
//second trinket conversation
obj.flags[42] = 1;
obj.flags[42] = true;
load("talkblue_trinket2");
position--;
}
else if (obj.flags[41] == 0 && obj.flags[42] == 0)
else if (!obj.flags[41] && !obj.flags[42])
{
//Third trinket conversation
obj.flags[42] = 1;
obj.flags[42] = true;
load("talkblue_trinket3");
position--;
}
@@ -2268,56 +2268,56 @@ void scriptclass::run()
}
}
}
else if (obj.flags[33] == 1 && obj.flags[40] == 0)
else if (obj.flags[33] && !obj.flags[40])
{
//Intermission level
obj.flags[40] = 1;
obj.flags[40] = true;
load("talkblue_7");
position--;
}
else if (obj.flags[36] == 0 && game.crewstats[5])
else if (!obj.flags[36] && game.crewstats[5])
{
//Back on the ship!
obj.flags[36] = 1;
obj.flags[36] = true;
load("talkblue_3");
position--;
}
else if (obj.flags[41] == 0 && game.crewrescued() <= 4)
else if (!obj.flags[41] && game.crewrescued() <= 4)
{
//First trinket conversation
obj.flags[41] = 1;
obj.flags[41] = true;
load("talkblue_trinket1");
position--;
}
else if (obj.flags[41] == 1 && obj.flags[42] == 0 && game.crewrescued() == 5)
else if (obj.flags[41] && !obj.flags[42] && game.crewrescued() == 5)
{
//second trinket conversation
obj.flags[42] = 1;
obj.flags[42] = true;
load("talkblue_trinket2");
position--;
}
else if (obj.flags[41] == 0 && obj.flags[42] == 0 && game.crewrescued() == 5)
else if (!obj.flags[41] && !obj.flags[42] && game.crewrescued() == 5)
{
//Third trinket conversation
obj.flags[42] = 1;
obj.flags[42] = true;
load("talkblue_trinket3");
position--;
}
else if (obj.flags[37] == 0 && game.crewstats[2])
else if (!obj.flags[37] && game.crewstats[2])
{
obj.flags[37] = 1;
obj.flags[37] = true;
load("talkblue_4");
position--;
}
else if (obj.flags[38] == 0 && game.crewstats[3])
else if (!obj.flags[38] && game.crewstats[3])
{
obj.flags[38] = 1;
obj.flags[38] = true;
load("talkblue_5");
position--;
}
else if (obj.flags[39] == 0 && game.crewstats[4])
else if (!obj.flags[39] && game.crewstats[4])
{
obj.flags[39] = 1;
obj.flags[39] = true;
load("talkblue_6");
position--;
}
@@ -2344,75 +2344,75 @@ void scriptclass::run()
load("talkyellow_12");
position--;
}
else if (obj.flags[67] == 1)
else if (obj.flags[67])
{
//game complete
load("talkyellow_11");
position--;
}
else if (obj.flags[32] == 1 && obj.flags[31] == 0)
else if (obj.flags[32] && !obj.flags[31])
{
//Intermission level
obj.flags[31] = 1;
obj.flags[31] = true;
load("talkyellow_6");
position--;
}
else if (obj.flags[27] == 0 && game.crewstats[2])
else if (!obj.flags[27] && game.crewstats[2])
{
//Back on the ship!
obj.flags[27] = 1;
obj.flags[27] = true;
load("talkyellow_10");
position--;
}
else if (obj.flags[43] == 0 && game.crewrescued() == 5 && !game.crewstats[5])
else if (!obj.flags[43] && game.crewrescued() == 5 && !game.crewstats[5])
{
//If by chance we've rescued everyone except Victoria by the end, Vitellary provides you with
//the trinket information instead.
obj.flags[43] = 1;
obj.flags[42] = 1;
obj.flags[41] = 1;
obj.flags[43] = true;
obj.flags[42] = true;
obj.flags[41] = true;
load("talkyellow_trinket1");
position--;
}
else if (obj.flags[24] == 0 && game.crewstats[5])
else if (!obj.flags[24] && game.crewstats[5])
{
obj.flags[24] = 1;
obj.flags[24] = true;
load("talkyellow_8");
position--;
}
else if (obj.flags[26] == 0 && game.crewstats[4])
else if (!obj.flags[26] && game.crewstats[4])
{
obj.flags[26] = 1;
obj.flags[26] = true;
load("talkyellow_7");
position--;
}
else if (obj.flags[25] == 0 && game.crewstats[3])
else if (!obj.flags[25] && game.crewstats[3])
{
obj.flags[25] = 1;
obj.flags[25] = true;
load("talkyellow_9");
position--;
}
else if (obj.flags[28] == 0)
else if (!obj.flags[28])
{
obj.flags[28] = 1;
obj.flags[28] = true;
load("talkyellow_3");
position--;
}
else if (obj.flags[29] == 0)
else if (!obj.flags[29])
{
obj.flags[29] = 1;
obj.flags[29] = true;
load("talkyellow_4");
position--;
}
else if (obj.flags[30] == 0)
else if (!obj.flags[30])
{
obj.flags[30] = 1;
obj.flags[30] = true;
load("talkyellow_5");
position--;
}
else if (obj.flags[23] == 0)
else if (!obj.flags[23])
{
obj.flags[23] = 1;
obj.flags[23] = true;
load("talkyellow_2");
position--;
}
@@ -2420,7 +2420,7 @@ void scriptclass::run()
{
load("talkyellow_1");
position--;
obj.flags[23] = 0;
obj.flags[23] = false;
}
}
else if (words[0] == "purplecontrol")
@@ -2432,68 +2432,68 @@ void scriptclass::run()
load("talkpurple_9");
position--;
}
else if (obj.flags[67] == 1)
else if (obj.flags[67])
{
//game complete
load("talkpurple_8");
position--;
}
else if (obj.flags[17] == 0 && game.crewstats[4])
else if (!obj.flags[17] && game.crewstats[4])
{
obj.flags[17] = 1;
obj.flags[17] = true;
load("talkpurple_6");
position--;
}
else if (obj.flags[15] == 0 && game.crewstats[5])
else if (!obj.flags[15] && game.crewstats[5])
{
obj.flags[15] = 1;
obj.flags[15] = true;
load("talkpurple_4");
position--;
}
else if (obj.flags[16] == 0 && game.crewstats[3])
else if (!obj.flags[16] && game.crewstats[3])
{
obj.flags[16] = 1;
obj.flags[16] = true;
load("talkpurple_5");
position--;
}
else if (obj.flags[18] == 0 && game.crewstats[2])
else if (!obj.flags[18] && game.crewstats[2])
{
obj.flags[18] = 1;
obj.flags[18] = true;
load("talkpurple_7");
position--;
}
else if (obj.flags[19] == 1 && obj.flags[20] == 0 && obj.flags[21] == 0)
else if (obj.flags[19] && !obj.flags[20] && !obj.flags[21])
{
//intermission one: if played one / not had first conversation / not played two [conversation one]
obj.flags[21] = 1;
obj.flags[21] = true;
load("talkpurple_intermission1");
position--;
}
else if (obj.flags[20] == 1 && obj.flags[21] == 1 && obj.flags[22] == 0)
else if (obj.flags[20] && obj.flags[21] && !obj.flags[22])
{
//intermission two: if played two / had first conversation / not had second conversation [conversation two]
obj.flags[22] = 1;
obj.flags[22] = true;
load("talkpurple_intermission2");
position--;
}
else if (obj.flags[20] == 1 && obj.flags[21] == 0 && obj.flags[22] == 0)
else if (obj.flags[20] && !obj.flags[21] && !obj.flags[22])
{
//intermission two: if played two / not had first conversation / not had second conversation [conversation three]
obj.flags[22] = 1;
obj.flags[22] = true;
load("talkpurple_intermission3");
position--;
}
else if (obj.flags[12] == 0)
else if (!obj.flags[12])
{
//Intro conversation
obj.flags[12] = 1;
obj.flags[12] = true;
load("talkpurple_intro");
position--;
}
else if (obj.flags[14] == 0)
else if (!obj.flags[14])
{
//Shorter intro conversation
obj.flags[14] = 1;
obj.flags[14] = true;
load("talkpurple_3");
position--;
}