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

Remove global args from Game

Browse Source 
I've decided to call dwgfx/game/map/obj/key/help/music the "global args".
Because they're essentially global variables that are being passed
around in args.

This commit removes global args from all functions on the Game class,
and deals with updating the callsites of said functions accordingly. It
also renames all usages of 'dwgfx' in Game.cpp to 'graphics', since the
global variable is called 'graphics' now.

Interesting to note, I was removing the class defines from Game.h, but
it turns out that Graphics.h depends on the mapclass and entityclass
defines from Game.h. And also Graphics.h spelled mapclass wrong (it
forgot the "class") so I just decided to use that existing line instead.
This is only temporary and after all is said and done, at the end of
this pull request those class defines will be gone.
This commit is contained in:
Misa 2020-03-30 17:16:02 -07:00 committed by Ethan Lee
parent 1be398319c
commit 0e561f23f8
8 changed files with 586 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

919
desktop_version/src/Game.cpp
View File

File diff suppressed because it is too large Load Diff

55
desktop_version/src/Game.h
View File

@ -9,11 +9,6 @@
#include "GraphicsUtil.h"
class entityclass;
class mapclass;
class Graphics;
class musicclass;
class Game
{
public:
@ -37,52 +32,52 @@ public:
void resetgameclock();
void customsavequick(std::string savfile, mapclass& map, entityclass& obj, musicclass& music);
void savequick(mapclass& map, entityclass& obj, musicclass& music);
void customsavequick(std::string savfile);
void savequick();
void gameclock();
std::string giventimestring(int hrs, int min, int sec, UtilityClass& help );
std::string giventimestring(int hrs, int min, int sec);
std::string timestring(UtilityClass& help);
std::string timestring();
std::string partimestring(UtilityClass& help);
std::string partimestring();
std::string resulttimestring(UtilityClass& help);
std::string resulttimestring();
std::string timetstring(int t, UtilityClass& help);
std::string timetstring(int t);
void createmenu(std::string t);
void lifesequence(entityclass& obj);
void lifesequence();
void gethardestroom(mapclass& map);
void gethardestroom();
void updatestate(Graphics& dwgfx, mapclass& map, entityclass& obj, UtilityClass& help, musicclass& music);
void updatestate();
void unlocknum(int t, mapclass& map, Graphics& dwgfx);
void unlocknum(int t);
void loadstats(mapclass& map, Graphics& dwgfx);
void loadstats();
void savestats(mapclass& map, Graphics& dwgfx);
void savestats();
void deletestats(mapclass& map, Graphics& dwgfx);
void deletestats();
void deletequick();
void savetele(mapclass& map, entityclass& obj, musicclass& music);
void savetele();
void loadtele(mapclass& map, entityclass& obj, musicclass& music);
void loadtele();
void deletetele();
void customstart(entityclass& obj, musicclass& music );
void customstart();
void start(entityclass& obj, musicclass& music );
void start();
void startspecial(int t, entityclass& obj, musicclass& music);
void startspecial(int t);
void starttrial(int t, entityclass& obj, musicclass& music);
void starttrial(int t);
void telegotoship()
{
@ -104,14 +99,14 @@ public:
void swnpenalty();
void deathsequence(mapclass& map, entityclass& obj, musicclass& music);
void deathsequence();
void customloadquick(std::string savfile, mapclass& map, entityclass& obj, musicclass& music);
void loadquick(mapclass& map, entityclass& obj, musicclass& music);
void customloadquick(std::string savfile);
void loadquick();
void loadsummary(mapclass& map, UtilityClass& help);
void loadsummary();
void initteleportermode(mapclass& map);
void initteleportermode();
std::string saveFilePath;

3
desktop_version/src/Graphics.h
View File

@ -19,7 +19,8 @@
#include "GraphicsUtil.h"
#include "Screen.h"
class map;
class mapclass;
class entityclass;
class Graphics
{

76
desktop_version/src/Input.cpp
View File

@ -511,7 +511,7 @@ SDL_assert(0 && "Remove open level dir");
dwgfx.screenbuffer->toggleFullScreen();
game.fullscreen = !game.fullscreen;
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 0;
}else if (game.currentmenuoption == 1){
@ -519,7 +519,7 @@ SDL_assert(0 && "Remove open level dir");
dwgfx.screenbuffer->toggleStretchMode();
game.stretchMode = (game.stretchMode + 1) % 3;
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 1;
}else if (game.currentmenuoption == 2){
@ -527,7 +527,7 @@ SDL_assert(0 && "Remove open level dir");
dwgfx.screenbuffer->toggleLinearFilter();
game.useLinearFilter = !game.useLinearFilter;
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 2;
}else if (game.currentmenuoption == 3){
@ -537,7 +537,7 @@ SDL_assert(0 && "Remove open level dir");
//Hook the analogue thing in here: ABCDEFG
updategraphicsmode(game, dwgfx);
dwgfx.screenbuffer->badSignalEffect= !dwgfx.screenbuffer->badSignalEffect;
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 3;
}else if (game.currentmenuoption == 4) {
@ -577,7 +577,7 @@ SDL_assert(0 && "Remove open level dir");
game.fullscreen = true;
}
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
}
else if (game.currentmenuoption == 1)
@ -593,7 +593,7 @@ SDL_assert(0 && "Remove open level dir");
}
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 1;
}
@ -606,7 +606,7 @@ SDL_assert(0 && "Remove open level dir");
dwgfx.screenbuffer->SetScale(game.advanced_scaling);
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 2;
}
@ -617,7 +617,7 @@ SDL_assert(0 && "Remove open level dir");
game.advanced_smoothing = !game.advanced_smoothing;
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 3;
}
@ -646,7 +646,7 @@ SDL_assert(0 && "Remove open level dir");
}
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
}
else if (game.currentmenuoption == 1)
@ -662,7 +662,7 @@ SDL_assert(0 && "Remove open level dir");
}
updategraphicsmode(game, dwgfx);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("graphicoptions");
game.currentmenuoption = 1;
}
@ -707,7 +707,7 @@ SDL_assert(0 && "Remove open level dir");
map.invincibility = !map.invincibility;
//game.deletequick();
//game.deletetele();
game.savestats(map, dwgfx);
game.savestats();
music.playef(11, 10);
game.createmenu("accessibility");
game.currentmenuoption = 3;
@ -741,7 +741,7 @@ SDL_assert(0 && "Remove open level dir");
//back
game.gameframerate=34;
game.slowdown = 30;
game.savestats(map, dwgfx);
game.savestats();
music.playef(11, 10);
game.createmenu("accessibility");
game.currentmenuoption = 4;
@ -751,7 +751,7 @@ SDL_assert(0 && "Remove open level dir");
{
game.gameframerate=41;
game.slowdown = 24;
game.savestats(map, dwgfx);
game.savestats();
music.playef(11, 10);
game.createmenu("accessibility");
game.currentmenuoption = 4;
@ -761,7 +761,7 @@ SDL_assert(0 && "Remove open level dir");
{
game.gameframerate=55;
game.slowdown = 18;
game.savestats(map, dwgfx);
game.savestats();
music.playef(11, 10);
game.createmenu("accessibility");
game.currentmenuoption = 4;
@ -771,7 +771,7 @@ SDL_assert(0 && "Remove open level dir");
{
game.gameframerate=83;
game.slowdown = 12;
game.savestats(map, dwgfx);
game.savestats();
music.playef(11, 10);
game.createmenu("accessibility");
game.currentmenuoption = 4;
@ -784,7 +784,7 @@ SDL_assert(0 && "Remove open level dir");
{
//disable animated backgrounds
game.colourblindmode = !game.colourblindmode;
game.savestats(map, dwgfx);
game.savestats();
map.tdrawback = true;
music.playef(11, 10);
}
@ -792,7 +792,7 @@ SDL_assert(0 && "Remove open level dir");
{
//disable screeneffects
game.noflashingmode = !game.noflashingmode;
game.savestats(map, dwgfx);
game.savestats();
if (!game.noflashingmode)
{
music.playef(18, 10);
@ -806,7 +806,7 @@ SDL_assert(0 && "Remove open level dir");
{
//disable text outline
dwgfx.notextoutline = !dwgfx.notextoutline;
game.savestats(map, dwgfx);
game.savestats();
music.playef(11, 10);
}
else if (game.currentmenuoption == 3)
@ -912,7 +912,7 @@ SDL_assert(0 && "Remove open level dir");
music.usingmmmmmm = !music.usingmmmmmm;
music.playef(11, 10);
music.play(6);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("mainmenu");
map.nexttowercolour();
}
@ -975,7 +975,7 @@ SDL_assert(0 && "Remove open level dir");
music.usingmmmmmm = !music.usingmmmmmm;
music.playef(11, 10);
music.play(6);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("mainmenu");
map.nexttowercolour();
}
@ -1004,7 +1004,7 @@ SDL_assert(0 && "Remove open level dir");
game.unlock[9] = true;
game.unlocknotify[9] = true;
music.playef(11, 10);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenutrials");
game.currentmenuoption = 0;
}
@ -1013,7 +1013,7 @@ SDL_assert(0 && "Remove open level dir");
game.unlock[10] = true;
game.unlocknotify[10] = true;
music.playef(11, 10);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenutrials");
game.currentmenuoption = 1;
}
@ -1022,7 +1022,7 @@ SDL_assert(0 && "Remove open level dir");
game.unlock[11] = true;
game.unlocknotify[11] = true;
music.playef(11, 10);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenutrials");
game.currentmenuoption = 2;
}
@ -1031,7 +1031,7 @@ SDL_assert(0 && "Remove open level dir");
game.unlock[12] = true;
game.unlocknotify[12] = true;
music.playef(11, 10);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenutrials");
game.currentmenuoption = 3;
}
@ -1040,7 +1040,7 @@ SDL_assert(0 && "Remove open level dir");
game.unlock[13] = true;
game.unlocknotify[13] = true;
music.playef(11, 10);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenutrials");
game.currentmenuoption = 4;
}
@ -1049,7 +1049,7 @@ SDL_assert(0 && "Remove open level dir");
game.unlock[14] = true;
game.unlocknotify[14] = true;
music.playef(11, 10);
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenutrials");
game.currentmenuoption = 5;
}
@ -1078,7 +1078,7 @@ SDL_assert(0 && "Remove open level dir");
game.unlocknotify[16] = true;
game.unlock[6] = true;
game.unlock[7] = true;
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenu");
game.currentmenuoption = 1;
}
@ -1088,7 +1088,7 @@ SDL_assert(0 && "Remove open level dir");
music.playef(11, 10);
game.unlock[17] = true;
game.unlocknotify[17] = true;
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenu");
game.currentmenuoption = 2;
}
@ -1098,7 +1098,7 @@ SDL_assert(0 && "Remove open level dir");
music.playef(11, 10);
game.unlock[18] = true;
game.unlocknotify[18] = true;
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenu");
game.currentmenuoption = 3;
}
@ -1107,7 +1107,7 @@ SDL_assert(0 && "Remove open level dir");
//unlock jukebox
music.playef(11, 10);
game.stat_trinkets = 20;
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenu");
game.currentmenuoption = 4;
}
@ -1117,7 +1117,7 @@ SDL_assert(0 && "Remove open level dir");
music.playef(11, 10);
game.unlock[8] = true;
game.unlocknotify[8] = true;
game.savestats(map, dwgfx);
game.savestats();
game.createmenu("unlockmenu");
game.currentmenuoption = 5;
}
@ -1313,7 +1313,7 @@ SDL_assert(0 && "Remove open level dir");
{
//go to a menu!
music.playef(11, 10);
game.loadsummary(map, help); //Prepare save slots to display
game.loadsummary(); //Prepare save slots to display
game.createmenu("continue");
map.settowercolour(3);
}
@ -1363,7 +1363,7 @@ SDL_assert(0 && "Remove open level dir");
{
//go to a menu!
music.playef(11, 10);
game.loadsummary(map, help); //Prepare save slots to display
game.loadsummary(); //Prepare save slots to display
game.createmenu("continue");
map.settowercolour(3);
}
@ -1486,7 +1486,7 @@ SDL_assert(0 && "Remove open level dir");
music.playef(23, 10);
game.deletequick();
game.deletetele();
game.deletestats(map, dwgfx);
game.deletestats();
game.flashlight = 5;
game.screenshake = 15;
game.createmenu("mainmenu");
@ -2071,7 +2071,7 @@ void gameinput(KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
dwgfx.resumegamemode = false;
game.useteleporter = true;
game.initteleportermode(map);
game.initteleportermode();
}
else
{
@ -2403,7 +2403,7 @@ void mapinput(KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
music.playef(18, 10);
game.gamesaved = true;
game.savetime = game.timestring(help);
game.savetime = game.timestring();
game.savearea = map.currentarea(map.area(game.roomx, game.roomy));
game.savetrinkets = game.trinkets;
@ -2412,12 +2412,12 @@ void mapinput(KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
#if !defined(NO_CUSTOM_LEVELS)
if(map.custommodeforreal)
{
game.customsavequick(ed.ListOfMetaData[game.playcustomlevel].filename, map, obj, music);
game.customsavequick(ed.ListOfMetaData[game.playcustomlevel].filename);
}
else
#endif
{
game.savequick(map, obj, music);
game.savequick();
}
}

20
desktop_version/src/Logic.cpp
View File

@ -114,7 +114,7 @@ void gamecompletelogic2(Graphics& dwgfx, Game& game, entityclass& obj, musiccla
game.deletequick();
int tmp=music.currentsong;
music.currentsong=4;
game.savetele(map,obj,music);
game.savetele();
music.currentsong=tmp;
game.telegotoship();
//Return to game
@ -254,7 +254,7 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi
{
if (map.resumedelay <= 0)
{
game.lifesequence(obj);
game.lifesequence();
if (game.lifeseq == 0) map.cameramode = 1;
}
else
@ -268,14 +268,14 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi
{
map.colsuperstate = 1;
map.cameramode = 2;
game.deathsequence(map, obj, music);
game.deathsequence();
game.deathseq--;
if (game.deathseq <= 0)
{
if (game.nodeathmode)
{
game.deathseq = 1;
game.gethardestroom(map);
game.gethardestroom();
//start depressing sequence here...
if (game.gameoverdelay <= -10 && dwgfx.fademode==0) dwgfx.fademode = 2;
if (dwgfx.fademode == 1) script.resetgametomenu(dwgfx, game, map, obj, help, music);
@ -297,7 +297,7 @@ void towerlogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& musi
else
{
//State machine for game logic
game.updatestate(dwgfx, map, obj, help, music);
game.updatestate();
//Time trial stuff
@ -571,7 +571,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
obj.upset = 0;
}
game.lifesequence(obj);
game.lifesequence();
if (game.deathseq != -1)
@ -647,14 +647,14 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
}
}
game.deathsequence(map, obj, music);
game.deathsequence();
game.deathseq--;
if (game.deathseq <= 0)
{
if (game.nodeathmode)
{
game.deathseq = 1;
game.gethardestroom(map);
game.gethardestroom();
//start depressing sequence here...
if (game.gameoverdelay <= -10 && dwgfx.fademode==0) dwgfx.fademode = 2;
if (dwgfx.fademode == 1) script.resetgametomenu(dwgfx, game, map, obj, help, music);
@ -672,7 +672,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
}
}
game.gethardestroom(map);
game.gethardestroom();
game.hascontrol = true;
@ -715,7 +715,7 @@ void gamelogic(Graphics& dwgfx, Game& game, entityclass& obj, musicclass& music
}
}
//State machine for game logic
game.updatestate(dwgfx, map, obj, help, music);
game.updatestate();
if (game.startscript)
{
script.load(game.newscript);

62
desktop_version/src/Script.cpp
View File

@ -1987,7 +1987,7 @@ void scriptclass::run( KeyPoll& key, Graphics& dwgfx, Game& game, mapclass& map,
}
else if (words[0] == "telesave")
{
if (!game.intimetrial && !game.nodeathmode && !game.inintermission) game.savetele(map, obj, music);
if (!game.intimetrial && !game.nodeathmode && !game.inintermission) game.savetele();
}
else if (words[0] == "createlastrescued")
{
@ -2548,7 +2548,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
case 0: //Normal new game
game.gamestate = GAMEMODE;
hardreset(key, dwgfx, game, map, obj, help, music);
game.start(obj, music);
game.start();
game.jumpheld = true;
dwgfx.showcutscenebars = true;
dwgfx.cutscenebarspos = 320;
@ -2571,8 +2571,8 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
case 1:
game.gamestate = GAMEMODE;
hardreset(key, dwgfx, game, map, obj, help, music);
game.start(obj, music);
game.loadtele(map, obj, music);
game.start();
game.loadtele();
game.gravitycontrol = game.savegc;
game.jumpheld = true;
@ -2593,8 +2593,8 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
case 2: //Load Quicksave
game.gamestate = GAMEMODE;
hardreset(key, dwgfx, game, map, obj, help, music);
game.start(obj, music);
game.loadquick(map, obj, music);
game.start();
game.loadquick();
game.gravitycontrol = game.savegc;
game.jumpheld = true;
@ -2636,7 +2636,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
music.fadeout();
game.gamestate = GAMEMODE;
game.starttrial(game.timetriallevel, obj, music);
game.starttrial(game.timetriallevel);
game.jumpheld = true;
if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode
@ -2664,7 +2664,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
music.fadeout();
game.gamestate = GAMEMODE;
game.starttrial(game.timetriallevel, obj, music);
game.starttrial(game.timetriallevel);
game.jumpheld = true;
if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode
@ -2692,7 +2692,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
music.fadeout();
game.gamestate = GAMEMODE;
game.starttrial(game.timetriallevel, obj, music);
game.starttrial(game.timetriallevel);
game.jumpheld = true;
if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode
@ -2720,7 +2720,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
music.fadeout();
game.gamestate = GAMEMODE;
game.starttrial(game.timetriallevel, obj, music);
game.starttrial(game.timetriallevel);
game.jumpheld = true;
if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode
@ -2748,7 +2748,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
music.fadeout();
game.gamestate = GAMEMODE;
game.starttrial(game.timetriallevel, obj, music);
game.starttrial(game.timetriallevel);
game.jumpheld = true;
if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode
@ -2782,7 +2782,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_mapcol = 0;
map.final_colorframe = 0;
game.gamestate = GAMEMODE;
game.starttrial(game.timetriallevel, obj, music);
game.starttrial(game.timetriallevel);
game.jumpheld = true;
if (dwgfx.setflipmode) dwgfx.flipmode = true;//set flipmode
@ -2801,11 +2801,11 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
game.gamestate = GAMEMODE;
hardreset(key, dwgfx, game, map, obj, help, music);
game.nodeathmode = true;
game.start(obj, music);
game.start();
game.jumpheld = true;
dwgfx.showcutscenebars = true;
dwgfx.cutscenebarspos = 320;
//game.starttest(obj, music);
//game.starttest();
//music.play(4);
//set flipmode
@ -2830,11 +2830,11 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
game.nodeathmode = true;
game.nocutscenes = true;
game.start(obj, music);
game.start();
game.jumpheld = true;
dwgfx.showcutscenebars = true;
dwgfx.cutscenebarspos = 320;
//game.starttest(obj, music);
//game.starttest();
//music.play(4);
//set flipmode
@ -2857,7 +2857,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
game.gamestate = GAMEMODE;
hardreset(key, dwgfx, game, map, obj, help, music);
game.startspecial(0, obj, music);
game.startspecial(0);
game.jumpheld = true;
//Secret lab, so reveal the map, give them all 20 trinkets
@ -2906,7 +2906,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -2941,7 +2941,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -2976,7 +2976,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -3011,7 +3011,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -3043,7 +3043,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -3075,7 +3075,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -3107,7 +3107,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -3139,7 +3139,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.final_colormode = false;
map.final_mapcol = 0;
map.final_colorframe = 0;
game.startspecial(1, obj, music);
game.startspecial(1);
game.jumpheld = true;
//set flipmode
@ -3190,7 +3190,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
ed.kludgewarpdir[i+(j*ed.maxwidth)]=ed.level[i+(j*ed.maxwidth)].warpdir;
}
}
game.customstart(obj, music);
game.customstart();
game.jumpheld = true;
@ -3229,7 +3229,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
game.gamestate = GAMEMODE;
music.fadeout();
hardreset(key, dwgfx, game, map, obj, help, music);
game.customstart(obj, music);
game.customstart();
game.jumpheld = true;
map.custommodeforreal = true;
@ -3277,8 +3277,8 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
map.customx = 100;
map.customy = 100;
game.customstart(obj, music);
game.customloadquick(ed.ListOfMetaData[game.playcustomlevel].filename, map, obj, music);
game.customstart();
game.customloadquick(ed.ListOfMetaData[game.playcustomlevel].filename);
game.jumpheld = true;
game.gravitycontrol = game.savegc;
@ -3311,7 +3311,7 @@ void scriptclass::startgamemode( int t, KeyPoll& key, Graphics& dwgfx, Game& gam
break;
#endif
case 100:
game.savestats(map, dwgfx);
game.savestats();
SDL_Quit();
exit(0);
@ -3422,7 +3422,7 @@ void scriptclass::teleport( Graphics& dwgfx, Game& game, mapclass& map, entitycl
dwgfx.createtextbox(" Game Saved ", -1, 12, 174, 174, 174);
dwgfx.textboxtimer(25);
}
game.savetele(map, obj, music);
game.savetele();
}
}
}

6
desktop_version/src/main.cpp
View File

@ -191,7 +191,7 @@ int main(int argc, char *argv[])
map.bypos = map.ypos / 2;
//Moved screensetting init here from main menu V2.1
game.loadstats(map, graphics);
game.loadstats();
if (game.skipfakeload)
game.gamestate = TITLEMODE;
if(game.usingmmmmmm==0) music.usingmmmmmm=false;
@ -500,7 +500,7 @@ int main(int argc, char *argv[])
if (game.savemystats)
{
game.savemystats = false;
game.savestats(map, graphics);
game.savestats();
}
//Mute button
@ -565,7 +565,7 @@ int main(int argc, char *argv[])
//SDL_FreeSurface( gameScreen );
//Quit SDL
game.savestats(map, graphics);
game.savestats();
NETWORK_shutdown();
SDL_Quit();
FILESYSTEM_deinit();

38
desktop_version/src/titlerender.cpp
View File

@ -733,7 +733,7 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
{
dwgfx.bigprint( -1, 20, "Results", tr, tg, tb, true, 3);
tempstring = game.resulttimestring(help) + " / " + game.partimestring(help);
tempstring = game.resulttimestring() + " / " + game.partimestring();
dwgfx.drawspritesetcol(30, 80-15, 50, 22, help);
dwgfx.Print(65, 80-15, "TIME TAKEN:", 255, 255, 255);
@ -807,7 +807,7 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
dwgfx.Print( 16, 65, "BEST TIME ", tr, tg, tb);
dwgfx.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
dwgfx.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[0], help), tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[0]), tr, tg, tb);
dwgfx.Print( 110, 75, help.String(game.besttrinkets[0])+"/2", tr, tg, tb);
dwgfx.Print( 110, 85,help.String(game.bestlives[0]), tr, tg, tb);
@ -854,7 +854,7 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
dwgfx.Print( 16, 65, "BEST TIME ", tr, tg, tb);
dwgfx.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
dwgfx.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[1], help), tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[1]), tr, tg, tb);
dwgfx.Print( 110, 75, help.String(game.besttrinkets[1])+"/4", tr, tg, tb);
dwgfx.Print( 110, 85, help.String(game.bestlives[1]), tr, tg, tb);
@ -901,7 +901,7 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
dwgfx.Print( 16, 65, "BEST TIME ", tr, tg, tb);
dwgfx.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
dwgfx.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[2], help), tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[2]), tr, tg, tb);
dwgfx.Print( 110, 75, help.String(game.besttrinkets[2])+"/2", tr, tg, tb);
dwgfx.Print( 110, 85, help.String(game.bestlives[2]), tr, tg, tb);
@ -948,7 +948,7 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
dwgfx.Print( 16, 65, "BEST TIME ", tr, tg, tb);
dwgfx.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
dwgfx.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[3], help), tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[3]), tr, tg, tb);
dwgfx.Print( 110, 75, help.String(game.besttrinkets[3])+"/5", tr, tg, tb);
dwgfx.Print( 110, 85, help.String(game.bestlives[3]), tr, tg, tb);
@ -995,7 +995,7 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
dwgfx.Print( 16, 65, "BEST TIME ", tr, tg, tb);
dwgfx.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
dwgfx.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[4], help), tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[4]), tr, tg, tb);
dwgfx.Print( 110, 75, help.String(game.besttrinkets[4])+"/1", tr, tg, tb);
dwgfx.Print( 110, 85, help.String(game.bestlives[4]), tr, tg, tb);
@ -1042,7 +1042,7 @@ void titlerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, U
dwgfx.Print( 16, 65, "BEST TIME ", tr, tg, tb);
dwgfx.Print( 16, 75, "BEST SHINY ", tr, tg, tb);
dwgfx.Print( 16, 85, "BEST LIVES ", tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[5], help), tr, tg, tb);
dwgfx.Print( 110, 65, game.timetstring(game.besttimes[5]), tr, tg, tb);
dwgfx.Print( 110, 75, help.String(game.besttrinkets[5])+"/1", tr, tg, tb);
dwgfx.Print( 110, 85, help.String(game.bestlives[5]), tr, tg, tb);
@ -1741,11 +1741,11 @@ void gamerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, Ut
if(game.timetrialparlost)
{
dwgfx.bprint(56, 18, game.timestring(help), 196, 80, 80);
dwgfx.bprint(56, 18, game.timestring(), 196, 80, 80);
}
else
{
dwgfx.bprint(56, 18, game.timestring(help), 196, 196, 196);
dwgfx.bprint(56, 18, game.timestring(), 196, 196, 196);
}
if(game.deathcounts>0)
{
@ -1767,12 +1767,12 @@ void gamerender(Graphics& dwgfx, mapclass& map, Game& game, entityclass& obj, Ut
if(game.timetrialparlost)
{
dwgfx.bprint(195, 214, "PAR TIME:", 80, 80, 80);
dwgfx.bprint(275, 214, game.partimestring(help), 80, 80, 80);
dwgfx.bprint(275, 214, game.partimestring(), 80, 80, 80);
}
else
{
dwgfx.bprint(195, 214, "PAR TIME:", 255, 255, 255);
dwgfx.bprint(275, 214, game.partimestring(help), 196, 196, 196);
dwgfx.bprint(275, 214, game.partimestring(), 196, 196, 196);
}
}
}
@ -2397,7 +2397,7 @@ void maprender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, Uti
dwgfx.Print(0, 102,help.String(game.deathcounts), 96,96,96, true);
dwgfx.Print(0, 64, "[Time Taken]", 196, 196, 255 - help.glow, true);
dwgfx.Print(0, 52, game.timestring(help), 96, 96, 96, true);
dwgfx.Print(0, 52, game.timestring(), 96, 96, 96, true);
}
else
{
@ -2408,7 +2408,7 @@ void maprender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, Uti
dwgfx.Print(0, 114,help.String(game.deathcounts), 96,96,96, true);
dwgfx.Print(0, 152, "[Time Taken]", 196, 196, 255 - help.glow, true);
dwgfx.Print(0, 164, game.timestring(help), 96, 96, 96, true);
dwgfx.Print(0, 164, game.timestring(), 96, 96, 96, true);
}
}else{
if (dwgfx.flipmode)
@ -2420,7 +2420,7 @@ void maprender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, Uti
dwgfx.Print(0, 102,help.String(game.deathcounts), 96,96,96, true);
dwgfx.Print(0, 64, "[Time Taken]", 196, 196, 255 - help.glow, true);
dwgfx.Print(0, 52, game.timestring(help), 96, 96, 96, true);
dwgfx.Print(0, 52, game.timestring(), 96, 96, 96, true);
}
else
{
@ -2431,7 +2431,7 @@ void maprender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, Uti
dwgfx.Print(0, 114,help.String(game.deathcounts), 96,96,96, true);
dwgfx.Print(0, 152, "[Time Taken]", 196, 196, 255 - help.glow, true);
dwgfx.Print(0, 164, game.timestring(help), 96, 96, 96, true);
dwgfx.Print(0, 164, game.timestring(), 96, 96, 96, true);
}
}
break;
@ -2851,11 +2851,11 @@ void towerrender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, U
if(game.timetrialparlost)
{
dwgfx.bprint(56, 18, game.timestring(help), 196, 80, 80);
dwgfx.bprint(56, 18, game.timestring(), 196, 80, 80);
}
else
{
dwgfx.bprint(56, 18, game.timestring(help), 196, 196, 196);
dwgfx.bprint(56, 18, game.timestring(), 196, 196, 196);
}
if(game.deathcounts>0)
{
@ -2877,12 +2877,12 @@ void towerrender(Graphics& dwgfx, Game& game, mapclass& map, entityclass& obj, U
if(game.timetrialparlost)
{
dwgfx.bprint(195, 214, "PAR TIME:", 80, 80, 80);
dwgfx.bprint(275, 214, game.partimestring(help), 80, 80, 80);
dwgfx.bprint(275, 214, game.partimestring(), 80, 80, 80);
}
else
{
dwgfx.bprint(195, 214, "PAR TIME:", 255, 255, 255);
dwgfx.bprint(275, 214, game.partimestring(help), 196, 196, 196);
dwgfx.bprint(275, 214, game.partimestring(), 196, 196, 196);
}
}
}