commit 50954b53

sago007 · 2016-07-05 18:25
50954b53bc4161fd84c479324cf7c7865d3e5216 patch · browse files
parent e620cc141b8665324ff237823d69e018242cd2b0

Removed the old dialogbox

Changed files

M	Game/data/sprites/blockattack1.sprite before
D	Game/data/textures/dialogbox.png before
M	source/AUTH before
M	source/code/global.hpp before
M	source/code/main.cpp before
M	source/code/mainVars.inc before

diff --git a/Game/data/sprites/blockattack1.sprite b/Game/data/sprites/blockattack1.sprite index c7dee17..f1a2be6 100644 --- a/Game/data/sprites/blockattack1.sprite +++ b/Game/data/sprites/blockattack1.sprite

@@ -199,15 +199,6 @@

"number_of_frames" : 1,

"frame_time" : 1

-"dialogbox" : {

- "texture" : "dialogbox",

- "topx" : 0,

- "topy" : 0,

- "height" : 200,

- "width" : 600,

- "number_of_frames" : 1,

- "frame_time" : 1

-},

"explosion0" : {

"texture" : "explosion0",

"topx" : 0,

diff --git a/Game/data/textures/dialogbox.png b/Game/data/textures/dialogbox.png deleted file mode 100755 index a3e4402..0000000

Binary files a/Game/data/textures/dialogbox.png and /dev/null differ

diff --git a/source/AUTH b/source/AUTH index 225f3f5..a64fe26 100644 --- a/source/AUTH +++ b/source/AUTH

@@ -38,13 +38,11 @@ counter_2.png Poul Sander

counter_3.png Poul Sander

crossover.png Poul Sander

cursor.png Poul Sander

-dialogbox.png Poul Sander

explosion0.png openarena-svn887:/textures/sfx/130boom

explosion1.png openarena-svn887:/textures/sfx/130boom

explosion2.png openarena-svn887:/textures/sfx/130boom

explosion3.png openarena-svn887:/textures/sfx/130boom

fallback.png Poul Sander

-fileDialogbox.png Poul Sander

garbage_bl.png qubodup

garbage_b.png qubodup

garbage_br.png qubodup

diff --git a/source/code/global.hpp b/source/code/global.hpp index f20990e..00dc939 100644 --- a/source/code/global.hpp +++ b/source/code/global.hpp

@@ -41,7 +41,6 @@ extern sago::SagoSprite menuUnmarked;

extern sago::SagoSprite bHighScore;

extern sago::SagoSprite bBack;

extern sago::SagoSprite bNext;

-extern sago::SagoSprite dialogBox;

extern NFont nf_scoreboard_font;

extern NFont nf_standard_blue_font;

extern NFont nf_button_font;

diff --git a/source/code/main.cpp b/source/code/main.cpp index 74241e2..e4385b6 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -147,7 +147,6 @@ static int InitImages(sago::SagoSpriteHolder& holder) {

iDraw = holder.GetSprite("i_draw");

iLoser = holder.GetSprite("i_loser");

iChainFrame = holder.GetSprite("chain_frame");

- dialogBox = holder.GetSprite("dialogbox");

iLevelCheck = holder.GetSprite("i_level_check");

iLevelCheckBox = holder.GetSprite("i_level_check_box");

iLevelCheckBoxMarked = holder.GetSprite("i_level_check_box_marked");

diff --git a/source/code/mainVars.inc b/source/code/mainVars.inc index e3a0fd9..feefca5 100644 --- a/source/code/mainVars.inc +++ b/source/code/mainVars.inc

@@ -72,7 +72,6 @@ static sago::SagoSprite counter[3]; //Counts down from 3

static sago::SagoSprite bricks[7]; //The bricks, saved in an array of pointers

static sago::SagoSprite crossover; //Cross the bricks that will be cleared soon

static sago::SagoSprite balls[7]; //The balls (the small ones that jump around)

-sago::SagoSprite dialogBox;

static sago::SagoSprite iLevelCheck; //To the level select screen

static sago::SagoSprite iLevelCheckBox;

static sago::SagoSprite iLevelCheckBoxMarked;