projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
753225d
)
fixed using 'background.TOOLBOX', which was simply ignored before
author
Holger Schemel
<info@artsoft.org>
Fri, 27 Feb 2015 14:33:00 +0000
(15:33 +0100)
committer
Holger Schemel
<info@artsoft.org>
Fri, 27 Feb 2015 14:33:00 +0000
(15:33 +0100)
ChangeLog
patch
|
blob
|
history
src/editor.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 79172b1c0d63382ae7636ea1dfc17c1124e498e6..c91f0820ac21eded062e766dd8c17725a22008a0 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,6
@@
+2015-02-27
+ * fixed using "background.TOOLBOX", which was simply ignored before
+
2015-02-23
* added key pad '-', '+' and '0' keys to zoom function in level editor
* changed editor key shortcut for undo/redo to 'u' and 'Shift-u'
2015-02-23
* added key pad '-', '+' and '0' keys to zoom function in level editor
* changed editor key shortcut for undo/redo to 'u' and 'Shift-u'
diff --git
a/src/editor.c
b/src/editor.c
index 81d189decd0a7b1ba08ddddd291c4441abac2e59..367071bf811200b09eb96ee1312809b783a95ea3 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-7571,8
+7571,10
@@
void DrawLevelEd()
DrawSpecialEditorDoor();
/* draw new control window */
DrawSpecialEditorDoor();
/* draw new control window */
- BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
- DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
+ BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto,
+ graphic_info[IMG_BACKGROUND_TOOLBOX].src_x,
+ graphic_info[IMG_BACKGROUND_TOOLBOX].src_y,
+ EXSIZE, EYSIZE, EX, EY);
// redraw_mask |= REDRAW_ALL;
// redraw_mask |= REDRAW_ALL;