projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9433898
)
changed name of constant
author
Holger Schemel
<info@artsoft.org>
Fri, 15 May 2015 09:44:26 +0000
(11:44 +0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 15 May 2015 09:44:26 +0000
(11:44 +0200)
src/tools.c
patch
|
blob
|
history
src/tools.h
patch
|
blob
|
history
diff --git
a/src/tools.c
b/src/tools.c
index edc742da651a1f87cce68b41723cf6fb7b2a4be1..f3ce7a3a555f9b46ac930209b77fc9aeae621413 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-233,7
+233,7
@@
void DumpTile(int x, int y)
void SetDrawtoField(int mode)
{
void SetDrawtoField(int mode)
{
- if (mode == DRAW_
BUFFERED
&& setup.soft_scrolling)
+ if (mode == DRAW_
FIELDBUFFER
&& setup.soft_scrolling)
{
FX = 2 * TILEX_VAR;
FY = 2 * TILEY_VAR;
{
FX = 2 * TILEX_VAR;
FY = 2 * TILEY_VAR;
@@
-954,7
+954,7
@@
void ClearField()
if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING)
{
ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE);
if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING)
{
ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE);
- SetDrawtoField(DRAW_
BUFFERED
);
+ SetDrawtoField(DRAW_
FIELDBUFFER
);
}
else
SetDrawtoField(DRAW_BACKBUFFER);
}
else
SetDrawtoField(DRAW_BACKBUFFER);
@@
-2154,7
+2154,7
@@
void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
int sy = SY + (SYSIZE - ysize * font_height) / 2;
int xx, yy;
int sy = SY + (SYSIZE - ysize * font_height) / 2;
int xx, yy;
- SetDrawtoField(DRAW_
BUFFERED
);
+ SetDrawtoField(DRAW_
FIELDBUFFER
);
BlitScreenToBitmap(backbuffer);
BlitScreenToBitmap(backbuffer);
@@
-2215,7
+2215,7
@@
void ShowEnvelope(int envelope_nr)
game.envelope_active = FALSE;
game.envelope_active = FALSE;
- SetDrawtoField(DRAW_
BUFFERED
);
+ SetDrawtoField(DRAW_
FIELDBUFFER
);
redraw_mask |= REDRAW_FIELD;
BackToFront();
redraw_mask |= REDRAW_FIELD;
BackToFront();
@@
-2467,7
+2467,6
@@
void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_OPENING);
AnimateEnvelopeRequest(main_anim_mode, ACTION_OPENING);
AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_OPENING);
AnimateEnvelopeRequest(main_anim_mode, ACTION_OPENING);
-
}
else
{
}
else
{
@@
-2504,7
+2503,7
@@
void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
if (action == ACTION_CLOSING &&
game_status == GAME_MODE_PLAYING &&
level.game_engine_type == GAME_ENGINE_TYPE_RND)
if (action == ACTION_CLOSING &&
game_status == GAME_MODE_PLAYING &&
level.game_engine_type == GAME_ENGINE_TYPE_RND)
- SetDrawtoField(DRAW_
BUFFERED
);
+ SetDrawtoField(DRAW_
FIELDBUFFER
);
}
void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
}
void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
diff --git
a/src/tools.h
b/src/tools.h
index 8238ffc535d43fcf348f29a182ed80bd85308015..9ebaed30515982bf2c139c78105888ab08afb56c 100644
(file)
--- a/
src/tools.h
+++ b/
src/tools.h
@@
-16,7
+16,7
@@
#include "game.h"
/* for SetDrawtoField */
#include "game.h"
/* for SetDrawtoField */
-#define DRAW_
BUFFERED
1
+#define DRAW_
FIELDBUFFER
1
#define DRAW_BACKBUFFER 2
/* for DrawElementShifted */
#define DRAW_BACKBUFFER 2
/* for DrawElementShifted */