Skip to content

Commit 75a3ef5

Browse files
ADD: Fix bomb glitch when disease "nobomb"
1 parent 5ecb6fd commit 75a3ef5

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

server/uatomic_server.pas

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,19 +1339,23 @@
13391339
akLeft: fPLayer[Player].MoveState := msLeft;
13401340
akRight: fPLayer[Player].MoveState := msRight;
13411341
akFirstAction: Begin
1342-
If Double Then Begin
1343-
fPLayer[Player].Action := aaFirstDouble;
1344-
End
1345-
Else Begin
1346-
fPLayer[Player].Action := aaFirst;
1342+
If (Not (dNoBombs In fPLayer[Player].Disease)) Then Begin
1343+
If Double Then Begin
1344+
fPLayer[Player].Action := aaFirstDouble;
1345+
End
1346+
Else Begin
1347+
fPLayer[Player].Action := aaFirst;
1348+
End;
13471349
End;
13481350
End;
13491351
akSecondAction: Begin
1350-
If Double Then Begin
1351-
fPLayer[Player].Action := aaSecondDouble;
1352-
End
1353-
Else Begin
1354-
fPLayer[Player].Action := aaSecond;
1352+
If (Not (dNoBombs In fPLayer[Player].Disease)) Then Begin
1353+
If Double Then Begin
1354+
fPLayer[Player].Action := aaSecondDouble;
1355+
End
1356+
Else Begin
1357+
fPLayer[Player].Action := aaSecond;
1358+
End;
13551359
End;
13561360
End;
13571361
End;

units/uatomic_common.pas

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
* FIX: "Slow" bug under Windows #7
112112
* -releaseG - 0.12007 = FIX: made Windows version more robust (start game did not really work ...)
113113
* -releaseG - 0.12008 = FIX: Drawgame in Teamsplay -> no finish detected
114+
* 0.12009 = FIX: if player has no bomb disease and places a bomb (which does not pop up), then it pops up exactly at that moment when the disease is over
114115
*)
115116

116117
ProtocollVersion: uint32 = 12; // ACHTUNG die Versionsnummer mus hier und in der Zeile darunter angepasst werden

0 commit comments

Comments
 (0)