Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-29 17:38:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove global args from Input.cpp

Browse Source 
This removes all global args from functions in Input.cpp. Additionally,
'dwgfx' has been renamed to 'graphics' in Input.cpp.
This commit is contained in:
Misa
2020-04-01 14:52:45 -07:00
committed by Ethan Lee
parent 2c138a4a60
commit a1fd4c6f02
3 changed files with 164 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
desktop_version/src/main.cpp
View File

@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
#endif
case TITLEMODE:
//Input
titleinput(key, graphics, map, game, obj, help, music);
titleinput();
//Render
titlerender(graphics, map, game, obj, help, music);
////Logic
@@ -381,11 +381,11 @@ int main(int argc, char *argv[])
case GAMEMODE:
if (map.towermode)
{
gameinput(key, graphics, game, map, obj, help, music);
gameinput();
//if(game.recording==1)
//{
// ///recordinput(key, graphics, game, map, obj, help, music);
// ///recordinput();
//}
//else
//{
@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
if (game.recording == 1)
{
//recordinput(key, dwgfx, game, map, obj, help, music);
//recordinput();
}
else
{
@@ -408,7 +408,7 @@ int main(int argc, char *argv[])
script.run();
}
gameinput(key, graphics, game, map, obj, help, music);
gameinput();
//}
gamerender(graphics,map, game, obj, help);
gamelogic();
@@ -420,11 +420,11 @@ int main(int argc, char *argv[])
maprender(graphics, game, map, obj, help);
if (game.recording == 1)
{
//recordinput(key, dwgfx, game, map, obj, help, music); //will implement this later if it's actually needed
//recordinput(); //will implement this later if it's actually needed
}
else
{
mapinput(key, graphics, game, map, obj, help, music);
mapinput();
}
maplogic();
break;
@@ -432,13 +432,13 @@ int main(int argc, char *argv[])
teleporterrender(graphics, game, map, obj, help);
if (game.recording == 1)
{
//recordinput(key, graphics, game, map, obj, help, music);
//recordinput();
}
else
{
if(game.useteleporter)
{
teleporterinput(key, graphics, game, map, obj, help, music);
teleporterinput();
}
else
{
@@ -446,7 +446,7 @@ int main(int argc, char *argv[])
{
script.run();
}
gameinput(key, graphics, game, map, obj, help, music);
gameinput();
}
}
maplogic();
@@ -454,14 +454,14 @@ int main(int argc, char *argv[])
case GAMECOMPLETE:
gamecompleterender(graphics, game, obj, help, map);
//Input
gamecompleteinput(key, graphics, game, map, obj, help, music);
gamecompleteinput();
//Logic
gamecompletelogic();
break;
case GAMECOMPLETE2:
gamecompleterender2(graphics, game, obj, help);
//Input
gamecompleteinput2(key, graphics, game, map, obj, help, music);
gamecompleteinput2();
//Logic
gamecompletelogic2();
break;