projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140305-3-src
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 2dd6d5bbac7a3019ad15a5b0d325b9add979da66..c0009b4013e74d852eeeec8dabba46579c1691e2 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-6748,8
+6748,8
@@
void CreateToolButtons()
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_INFO_TEXT, toolbutton_info[i].infotext,
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_INFO_TEXT, toolbutton_info[i].infotext,
- GDI_X, dx +
pos->x
,
- GDI_Y, dy +
pos->y
,
+ GDI_X, dx +
GDI_ACTIVE_POS(pos->x)
,
+ GDI_Y, dy +
GDI_ACTIVE_POS(pos->y)
,
GDI_WIDTH, gfx->width,
GDI_HEIGHT, gfx->height,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_WIDTH, gfx->width,
GDI_HEIGHT, gfx->height,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
@@
-6908,8
+6908,8
@@
void CreateToolButtons()
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_INFO_TEXT, toolbutton_info[i].infotext,
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_INFO_TEXT, toolbutton_info[i].infotext,
- GDI_X, DX +
toolbutton_info[i].x
,
- GDI_Y, DY +
toolbutton_info[i].y
,
+ GDI_X, DX +
GDI_ACTIVE_POS(toolbutton_info[i].x)
,
+ GDI_Y, DY +
GDI_ACTIVE_POS(toolbutton_info[i].y)
,
GDI_WIDTH, toolbutton_info[i].width,
GDI_HEIGHT, toolbutton_info[i].height,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_WIDTH, toolbutton_info[i].width,
GDI_HEIGHT, toolbutton_info[i].height,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
@@
-11382,7
+11382,9
@@
void ChangeViewportPropertiesIfNeeded()
InitGfxBuffers();
#endif
InitGfxBuffers();
#endif
+#if 0
if (gfx_game_mode == GAME_MODE_MAIN)
if (gfx_game_mode == GAME_MODE_MAIN)
+#endif
{
#if 1
init_gadgets_and_toons = TRUE;
{
#if 1
init_gadgets_and_toons = TRUE;