git repos / blockattack-game

commit c7e50476

sago007 · 2015-12-25 09:44
c7e50476d64374724257bb3b2a1955111aa3863c patch · browse files
parent fd23498743afc11fdb61385adf7248196ebff86c

Changed the buttons to the modern version

Changed files

M Game/data/sprites/blockattack1.sprite before
D Game/data/textures/b_back.png before
D Game/data/textures/b_forward.png before
D Game/data/textures/b_next.png before
D Game/data/textures/b_retry.png before
D Game/data/textures/b_skip.png before
M source/code/main.cpp before
diff --git a/Game/data/sprites/blockattack1.sprite b/Game/data/sprites/blockattack1.sprite index 5de00bc..78b7567 100644 --- a/Game/data/sprites/blockattack1.sprite +++ b/Game/data/sprites/blockattack1.sprite
@@ -82,15 +82,6 @@
"number_of_frames" : 1,
"frame_time" : 1
},
-"b_back" : {
- "texture" : "b_back",
- "topx" : 0,
- "topy" : 0,
- "height" : 40,
- "width" : 120,
- "number_of_frames" : 1,
- "frame_time" : 1
-},
"b_blank" : {
"texture" : "b_blank",
"topx" : 0,
@@ -109,15 +100,6 @@
"number_of_frames" : 1,
"frame_time" : 1
},
-"b_forward" : {
- "texture" : "b_forward",
- "topx" : 0,
- "topy" : 0,
- "height" : 40,
- "width" : 120,
- "number_of_frames" : 1,
- "frame_time" : 1
-},
"b_highscore" : {
"texture" : "b_highscore",
"topx" : 0,
@@ -154,15 +136,6 @@
"number_of_frames" : 1,
"frame_time" : 1
},
-"b_next" : {
- "texture" : "b_next",
- "topx" : 0,
- "topy" : 0,
- "height" : 40,
- "width" : 120,
- "number_of_frames" : 1,
- "frame_time" : 1
-},
"board_back_back" : {
"texture" : "board_back_back",
"topx" : 0,
@@ -181,24 +154,6 @@
"number_of_frames" : 1,
"frame_time" : 1
},
-"b_retry" : {
- "texture" : "b_retry",
- "topx" : 0,
- "topy" : 0,
- "height" : 40,
- "width" : 120,
- "number_of_frames" : 1,
- "frame_time" : 1
-},
-"b_skip" : {
- "texture" : "b_skip",
- "topx" : 0,
- "topy" : 0,
- "height" : 40,
- "width" : 120,
- "number_of_frames" : 1,
- "frame_time" : 1
-},
"chain_frame" : {
"texture" : "chain_frame",
"topx" : 0,
diff --git a/Game/data/textures/b_back.png b/Game/data/textures/b_back.png deleted file mode 100755 index 9bbe840..0000000
Binary files a/Game/data/textures/b_back.png and /dev/null differ
diff --git a/Game/data/textures/b_forward.png b/Game/data/textures/b_forward.png deleted file mode 100755 index fbfcb0b..0000000
Binary files a/Game/data/textures/b_forward.png and /dev/null differ
diff --git a/Game/data/textures/b_next.png b/Game/data/textures/b_next.png deleted file mode 100644 index c0172dd..0000000
Binary files a/Game/data/textures/b_next.png and /dev/null differ
diff --git a/Game/data/textures/b_retry.png b/Game/data/textures/b_retry.png deleted file mode 100644 index a54f4e9..0000000
Binary files a/Game/data/textures/b_retry.png and /dev/null differ
diff --git a/Game/data/textures/b_skip.png b/Game/data/textures/b_skip.png deleted file mode 100644 index 02feb60..0000000
Binary files a/Game/data/textures/b_skip.png and /dev/null differ
diff --git a/source/code/main.cpp b/source/code/main.cpp index a1d4603..75fe8d2 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp
@@ -141,7 +141,7 @@ static int InitImages(sago::SagoSpriteHolder& holder) {
bomb = holder.GetSprite("block_bomb");
backgroundImage = holder.GetSprite("background");
bHighScore = holder.GetSprite("b_highscore");
- bBack = holder.GetSprite("b_back");
+ bBack = holder.GetSprite("b_blank");
bForward = holder.GetSprite("b_forward");
blackLine = holder.GetSprite("black_line");
stageBobble = holder.GetSprite("i_stage_clear_limit");
@@ -193,9 +193,9 @@ static int InitImages(sago::SagoSpriteHolder& holder) {
smiley[2] = holder.GetSprite("smileys2");
smiley[3] = holder.GetSprite("smileys3");
transCover = holder.GetSprite("trans_cover");
- bSkip = holder.GetSprite("b_skip");
- bNext = holder.GetSprite("b_next");
- bRetry = holder.GetSprite("b_retry");
+ bSkip = holder.GetSprite("b_blank");
+ bNext = holder.GetSprite("b_blank");
+ bRetry = holder.GetSprite("b_blank");
mouse = holder.GetSprite("mouse");
menuMarked = holder.GetSprite("menu_marked");
menuUnmarked = holder.GetSprite("menu_unmarked");