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

Remove global args from scriptclass

Browse Source 
This commit removes all global args from the parameters of each function
on the scriptclass object, and updates all places they are called
accordingly. It also changes all instances of 'dwgfx' to 'graphics' in
Script.cpp.

Interestingly enough, it looks like editor.h depended on Script.h's
class define of the musicclass. I've temporarily placed the class define
in editor.h, but by the end of this patchset it'll be gone.
This commit is contained in:
Misa
2020-03-31 12:38:52 -07:00
committed by Ethan Lee
parent 2826bd828c
commit ea3c778b84
7 changed files with 172 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop_version/src/Input.cpp
View File

@@ -1795,7 +1795,7 @@ SDL_assert(0 && "Remove open level dir");
}
if (dwgfx.fademode == 1)
script.startgamemode(game.mainmenu, key, dwgfx, game, map, obj, help, music);
script.startgamemode(game.mainmenu);
}
void gameinput(KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
@@ -1956,7 +1956,7 @@ void gameinput(KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
{
//restart the time trial
game.quickrestartkludge = false;
script.startgamemode(game.timetriallevel + 3, key, dwgfx, game, map, obj, help, music);
script.startgamemode(game.timetriallevel + 3);
game.deathseq = -1;
game.completestop = false;
}
@@ -2121,7 +2121,7 @@ void gameinput(KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
else if (game.intimetrial && dwgfx.fademode==0)
{
//Quick restart of time trial
script.hardreset(key, dwgfx, game, map, obj, help, music);
script.hardreset();
if (dwgfx.setflipmode) dwgfx.flipmode = true;
dwgfx.fademode = 2;
game.completestop = true;
@@ -2435,7 +2435,7 @@ void mapinput(KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
//This fixes an apparent frame flicker.
FillRect(dwgfx.tempBuffer, 0x000000);
if (game.intimetrial || game.insecretlab || game.nodeathmode) game.menukludge = true;
script.hardreset(key, dwgfx, game, map, obj, help, music);
script.hardreset();
if(dwgfx.setflipmode) dwgfx.flipmode = true;
dwgfx.fademode = 2;
music.fadeout();