Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LEGER ROMAIN
CasseBrique
Commits
a41123d5
Commit
a41123d5
authored
Jan 28, 2016
by
Rominho15
Browse files
Version 9.5.4 : correction de bugs mineurs
parent
2cc10ff2
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/com/example/rleger/cassebrique/Screen/BetweenLevelActivity.java
View file @
a41123d5
...
...
@@ -54,9 +54,7 @@ public class BetweenLevelActivity extends AppCompatActivity {
i
.
putExtra
(
"score"
,
score
);
i
.
putExtra
(
"method"
,
methode
);
i
.
putExtra
(
"player"
,
player
);
i
.
putExtra
(
"difficulty"
,
difficulty
);
mp
.
stop
();
mp
.
release
();
i
.
putExtra
(
"difficulty"
,
difficulty
);
startActivity
(
i
);
}
...
...
app/src/main/java/com/example/rleger/cassebrique/Screen/EndActivity.java
View file @
a41123d5
...
...
@@ -149,7 +149,6 @@ public class EndActivity extends AppCompatActivity {
* @param v bouton de nouvelle partie
*/
public
void
toRetry
(
View
v
)
{
mp
.
stop
();
Intent
i
=
new
Intent
(
this
,
MainActivity
.
class
);
i
.
putExtra
(
"ini"
,
true
);
startActivity
(
i
);
...
...
app/src/main/java/com/example/rleger/cassebrique/Screen/MainActivity.java
View file @
a41123d5
...
...
@@ -100,8 +100,6 @@ public class MainActivity extends AppCompatActivity {
break
;
}
mp
.
stop
();
// Création de l'Intent, ajout des paramètres et démarre l'activité de jeu
Intent
i
=
new
Intent
(
this
,
GameActivity
.
class
);
i
.
putExtra
(
"level"
,
1
);
...
...
@@ -121,7 +119,6 @@ public class MainActivity extends AppCompatActivity {
Toast
.
makeText
(
this
,
R
.
string
.
BluetoothNo
,
Toast
.
LENGTH_SHORT
).
show
();
}
else
{
if
(
bluetoothAdapter
.
isEnabled
())
{
mp
.
stop
();
Toast
.
makeText
(
this
,
R
.
string
.
Bluetooth
,
Toast
.
LENGTH_SHORT
).
show
();
Intent
i
=
new
Intent
(
this
,
OnlineMenuActivity
.
class
);
startActivity
(
i
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment