projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed graphical bug when digging (crumbled) sand next to other player
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 6522b8e741382bc55352fb961f2e4fc5149fdd03..3f9fa56f8ef683be363200ec522c5cfec6439ba2 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-2274,7
+2274,9
@@
static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame)
!IN_SCR_FIELD(sxx, syy))
continue;
!IN_SCR_FIELD(sxx, syy))
continue;
- if (Feld[xx][yy] == EL_ELEMENT_SNAPPING)
+ // do not crumble fields that are being digged or snapped
+ if (Feld[xx][yy] == EL_EMPTY ||
+ Feld[xx][yy] == EL_ELEMENT_SNAPPING)
continue;
element = TILE_GFX_ELEMENT(xx, yy);
continue;
element = TILE_GFX_ELEMENT(xx, yy);
@@
-4811,17
+4813,17
@@
static boolean RequestEnvelope(char *text, unsigned int req_state)
boolean Request(char *text, unsigned int req_state)
{
boolean Request(char *text, unsigned int req_state)
{
- boolean overlay_
active = GetOverlayActive
();
+ boolean overlay_
enabled = GetOverlayEnabled
();
boolean result;
boolean result;
- SetOverlay
Active
(FALSE);
+ SetOverlay
Enabled
(FALSE);
if (global.use_envelope_request)
result = RequestEnvelope(text, req_state);
else
result = RequestDoor(text, req_state);
if (global.use_envelope_request)
result = RequestEnvelope(text, req_state);
else
result = RequestDoor(text, req_state);
- SetOverlay
Active(overlay_active
);
+ SetOverlay
Enabled(overlay_enabled
);
return result;
}
return result;
}