projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a268c89
)
rnd-20041129-4-src
author
Holger Schemel
<info@artsoft.org>
Mon, 29 Nov 2004 22:29:53 +0000
(23:29 +0100)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:48:31 +0000
(10:48 +0200)
src/conftime.h
patch
|
blob
|
history
src/tools.c
patch
|
blob
|
history
diff --git
a/src/conftime.h
b/src/conftime.h
index 95d114b26fa81b2d60cb44d78b6ad65a7aee6e96..cdf79d710d79d86fc79086d419b466fb042a6667 100644
(file)
--- a/
src/conftime.h
+++ b/
src/conftime.h
@@
-1
+1
@@
-#define COMPILE_DATE_STRING "[2004-11-29
18:02
]"
+#define COMPILE_DATE_STRING "[2004-11-29
23:28
]"
diff --git
a/src/tools.c
b/src/tools.c
index bd1ded0c740635fdf3400c55eb272d7c32c3418b..ffc1f1ec1e3428de66ddad24a774d28103626087 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-5969,8
+5969,12
@@
void InitGraphicInfo_EM(void)
#endif
/* create unique graphic identifier to decide if tile must be redrawn */
+ /* bit 31 - 16 (16 bit): EM style element
+ bit 15 - 12 ( 4 bit): EM style frame
+ bit 11 - 6 ( 6 bit): graphic width
+ bit 5 - 0 ( 6 bit): graphic height */
g_em->unique_identifier =
- (i << 16) | (
frame << 8) | g_em->width
| g_em->height;
+ (i << 16) | (
j << 12) | (g_em->width << 6)
| g_em->height;
#if DEBUG_EM_GFX
if (g_em->bitmap != debug_bitmap ||