From cef111d35b012b439dd282b58c8b3a8116cf3816 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 1 Apr 2020 15:01:08 -0700 Subject: [PATCH] Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'. --- desktop_version/src/main.cpp | 2 +- desktop_version/src/preloader.cpp | 62 +++++++++++++++---------------- desktop_version/src/preloader.h | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp index 76d9b6d4..976a9e4a 100644 --- a/desktop_version/src/main.cpp +++ b/desktop_version/src/main.cpp @@ -357,7 +357,7 @@ int main(int argc, char *argv[]) { case PRELOADER: //Render - preloaderrender(graphics, game, help); + preloaderrender(); break; #if !defined(NO_CUSTOM_LEVELS) case EDITORMODE: diff --git a/desktop_version/src/preloader.cpp b/desktop_version/src/preloader.cpp index eeca24f5..442114bb 100644 --- a/desktop_version/src/preloader.cpp +++ b/desktop_version/src/preloader.cpp @@ -9,10 +9,10 @@ int pre_darkcol=0, pre_lightcol=0, pre_curcol=0, pre_coltimer=0, pre_offset=0; int pre_frontrectx=30, pre_frontrecty=20, pre_frontrectw=260, pre_frontrecth=200; int pre_temprectx=0, pre_temprecty=0, pre_temprectw=320, pre_temprecth=240; -void preloaderrender(Graphics& dwgfx, Game& game, UtilityClass& help) +void preloaderrender() { //TODO - //dwgfx.backbuffer.lock(); + //graphics.backbuffer.lock(); //Draw grid @@ -34,32 +34,32 @@ void preloaderrender(Graphics& dwgfx, Game& game, UtilityClass& help) } switch(pre_curcol) { case 0: - pre_lightcol = dwgfx.RGBflip(0xBF,0x59,0x6F); - pre_darkcol = dwgfx.RGBflip(0x88,0x3E,0x53); + pre_lightcol = graphics.RGBflip(0xBF,0x59,0x6F); + pre_darkcol = graphics.RGBflip(0x88,0x3E,0x53); break; case 1: - pre_lightcol = dwgfx.RGBflip(0x6C,0xBC,0x5C); - pre_darkcol = dwgfx.RGBflip(0x50,0x86,0x40); + pre_lightcol = graphics.RGBflip(0x6C,0xBC,0x5C); + pre_darkcol = graphics.RGBflip(0x50,0x86,0x40); break; case 2: - pre_lightcol = dwgfx.RGBflip(0x5D,0x57,0xAA); - pre_darkcol = dwgfx.RGBflip(0x2F,0x2F,0x6C); + pre_lightcol = graphics.RGBflip(0x5D,0x57,0xAA); + pre_darkcol = graphics.RGBflip(0x2F,0x2F,0x6C); break; case 3: - pre_lightcol = dwgfx.RGBflip(0xB7,0xBA,0x5E); - pre_darkcol = dwgfx.RGBflip(0x84,0x83,0x42); + pre_lightcol = graphics.RGBflip(0xB7,0xBA,0x5E); + pre_darkcol = graphics.RGBflip(0x84,0x83,0x42); break; case 4: - pre_lightcol = dwgfx.RGBflip(0x57,0x90,0xAA); - pre_darkcol = dwgfx.RGBflip(0x2F,0x5B,0x6C); + pre_lightcol = graphics.RGBflip(0x57,0x90,0xAA); + pre_darkcol = graphics.RGBflip(0x2F,0x5B,0x6C); break; case 5: - pre_lightcol = dwgfx.RGBflip(0x90,0x61,0xB1); - pre_darkcol = dwgfx.RGBflip(0x58,0x3D,0x71); + pre_lightcol = graphics.RGBflip(0x90,0x61,0xB1); + pre_darkcol = graphics.RGBflip(0x58,0x3D,0x71); break; default: - pre_lightcol = dwgfx.RGBflip(0x00,0x00,0x00); - pre_darkcol = dwgfx.RGBflip(0x08,0x00,0x00); + pre_lightcol = graphics.RGBflip(0x00,0x00,0x00); + pre_darkcol = graphics.RGBflip(0x08,0x00,0x00); break; } @@ -67,20 +67,20 @@ void preloaderrender(Graphics& dwgfx, Game& game, UtilityClass& help) pre_temprecty = (i * 16)- pre_offset; if (i % 2 == 0) { - FillRect(dwgfx.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, pre_lightcol); + FillRect(graphics.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, pre_lightcol); } else { - FillRect(dwgfx.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, pre_darkcol); + FillRect(graphics.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, pre_darkcol); } } - FillRect(dwgfx.backBuffer, pre_frontrectx, pre_frontrecty, pre_frontrectw,pre_frontrecth, dwgfx.getBGR(0x3E,0x31,0xA2)); + FillRect(graphics.backBuffer, pre_frontrectx, pre_frontrecty, pre_frontrectw,pre_frontrecth, graphics.getBGR(0x3E,0x31,0xA2)); if(pre_fakepercent==100){ - dwgfx.Print(282-(15*8), 204, "LOADING... " + help.String(int(pre_fakepercent))+"%", 124, 112, 218, false); + graphics.Print(282-(15*8), 204, "LOADING... " + help.String(int(pre_fakepercent))+"%", 124, 112, 218, false); }else{ - dwgfx.Print(282-(14*8), 204, "LOADING... " + help.String(int(pre_fakepercent))+"%", 124, 112, 218, false); + graphics.Print(282-(14*8), 204, "LOADING... " + help.String(int(pre_fakepercent))+"%", 124, 112, 218, false); } //Render @@ -90,37 +90,37 @@ void preloaderrender(Graphics& dwgfx, Game& game, UtilityClass& help) }else if (pre_transition <= -10) { game.gamestate=TITLEMODE; }else if (pre_transition < 5) { - FillRect(dwgfx.backBuffer, 0, 0, 320,240, dwgfx.getBGR(0,0,0)); + FillRect(graphics.backBuffer, 0, 0, 320,240, graphics.getBGR(0,0,0)); }else if (pre_transition < 20) { pre_temprecty = 0; pre_temprecth = 240; - FillRect(dwgfx.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, 0x000000); - FillRect(dwgfx.backBuffer, pre_frontrectx, pre_frontrecty, pre_frontrectw,pre_frontrecth, dwgfx.getBGR(0x3E,0x31,0xA2)); + FillRect(graphics.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, 0x000000); + FillRect(graphics.backBuffer, pre_frontrectx, pre_frontrecty, pre_frontrectw,pre_frontrecth, graphics.getBGR(0x3E,0x31,0xA2)); - dwgfx.Print(282-(15*8), 204, "LOADING... 100%", 124, 112, 218, false); + graphics.Print(282-(15*8), 204, "LOADING... 100%", 124, 112, 218, false); } if (game.test) { - dwgfx.Print(5, 5, game.teststring, 196, 196, 255 - help.glow, false); + graphics.Print(5, 5, game.teststring, 196, 196, 255 - help.glow, false); } - dwgfx.drawfade(); + graphics.drawfade(); if (game.flashlight > 0 && !game.noflashingmode) { game.flashlight--; - dwgfx.flashlight(); + graphics.flashlight(); } if (game.screenshake > 0 && !game.noflashingmode) { game.screenshake--; - dwgfx.screenshake(); + graphics.screenshake(); } else { - dwgfx.render(); + graphics.render(); } - //dwgfx.backbuffer.unlock(); + //graphics.backbuffer.unlock(); } diff --git a/desktop_version/src/preloader.h b/desktop_version/src/preloader.h index bddcc083..d5a275b8 100644 --- a/desktop_version/src/preloader.h +++ b/desktop_version/src/preloader.h @@ -5,6 +5,6 @@ #include "Game.h" #include "UtilityClass.h" -void preloaderrender(Graphics& dwgfx, Game& game, UtilityClass& help); +void preloaderrender(); #endif /* PRELOADER_H */