projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b702ff
)
rnd-20050608-1-src
author
Holger Schemel
<info@artsoft.org>
Wed, 8 Jun 2005 00:18:34 +0000
(
02:18
+0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:49:05 +0000
(10:49 +0200)
ChangeLog
patch
|
blob
|
history
src/conftime.h
patch
|
blob
|
history
src/editor.c
patch
|
blob
|
history
src/libgame/misc.c
patch
|
blob
|
history
src/libgame/system.c
patch
|
blob
|
history
src/libgame/system.h
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index f3ba3c1d73a848df182ee49c61b80b36e6375468..e346627b038f3cd621c1111f6fa0a6b46734a5e9 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,8
+1,10
@@
2005-06-06
2005-06-06
- * fixed bug with exploding bomb using R'n'D graphics in EM engine
+ * fixed graphic bug with exploding bomb and R'n'D graphics in EM engine
+ * added "no direction" to "walkable/passable from" selectbox options
2005-06-05
* enhanced tape autoplay to accept "autoplay <set> [<nr> ...]" format
2005-06-05
* enhanced tape autoplay to accept "autoplay <set> [<nr> ...]" format
+ * in tape autoplay, not only report broken, but also missing tapes
2005-05-31
* uploaded pre-release (test) version 3.2.0-2 binary and source code
2005-05-31
* uploaded pre-release (test) version 3.2.0-2 binary and source code
diff --git
a/src/conftime.h
b/src/conftime.h
index 4a465568db4bc2bccdf4f0961ecca3e0245547cf..3a27e147bd3ea34ff7370d2a376207a8769f4d67 100644
(file)
--- a/
src/conftime.h
+++ b/
src/conftime.h
@@
-1
+1
@@
-#define COMPILE_DATE_STRING "[2005-06-0
5 23:5
7]"
+#define COMPILE_DATE_STRING "[2005-06-0
8 02:1
7]"
diff --git
a/src/editor.c
b/src/editor.c
index 988c1cdccc22da4b438a1b2093b4af669e9a07e2..0550f3e71131692d973f83ace88ad3bd14724aa1 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-1256,6
+1256,7
@@
static struct ValueTextInfo options_access_protected[] =
static struct ValueTextInfo options_access_direction[] =
{
static struct ValueTextInfo options_access_direction[] =
{
+ { MV_NO_DIRECTIONS, "no direction" },
{ MV_LEFT, "left" },
{ MV_RIGHT, "right" },
{ MV_UP, "up" },
{ MV_LEFT, "left" },
{ MV_RIGHT, "right" },
{ MV_UP, "up" },
diff --git
a/src/libgame/misc.c
b/src/libgame/misc.c
index a502ec49026cd1baab8dc85ac4f267a8a1cd68c6..f90b2c23b7b23f1bfb28420f4aac8784a9a31447 100644
(file)
--- a/
src/libgame/misc.c
+++ b/
src/libgame/misc.c
@@
-2472,6
+2472,12
@@
static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info,
char *basename = file_list_entry->filename;
char *filename = getCustomArtworkFilename(basename, artwork_info->type);
char *basename = file_list_entry->filename;
char *filename = getCustomArtworkFilename(basename, artwork_info->type);
+#if 0
+ if (strcmp(file_list_entry->token, "background.DOOR") == 0)
+ printf("::: replaceArtworkListEntry: '%s' => '%s'\n",
+ basename, filename);
+#endif
+
if (filename == NULL)
{
Error(ERR_WARN, "cannot find artwork file '%s'", basename);
if (filename == NULL)
{
Error(ERR_WARN, "cannot find artwork file '%s'", basename);
@@
-2532,6
+2538,11
@@
static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info,
return;
}
return;
}
+#if 0
+ if (strcmp(file_list_entry->token, "background.DOOR") == 0)
+ printf("::: replaceArtworkListEntry: LOAD IT'\n");
+#endif
+
#if 0
printf("::: %s: '%s'\n", init_text[artwork_info->type], basename);
#endif
#if 0
printf("::: %s: '%s'\n", init_text[artwork_info->type], basename);
#endif
@@
-2669,6
+2680,12
@@
static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info,
printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename);
#endif
printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename);
#endif
+#if 0
+ if (strcmp(file_list_entry->token, "background.DOOR") == 0)
+ printf("::: -> '%s' -> '%s'\n",
+ file_list_entry->token, file_list_entry->filename);
+#endif
+
if (strcmp(file_list_entry->filename, UNDEFINED_FILENAME) == 0)
{
deleteArtworkListEntry(artwork_info, listnode);
if (strcmp(file_list_entry->filename, UNDEFINED_FILENAME) == 0)
{
deleteArtworkListEntry(artwork_info, listnode);
@@
-2711,7
+2728,7
@@
static void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
#if 0
printf("loading artwork '%s' ... [%d]\n",
#if 0
printf("loading artwork '%s' ... [%d]\n",
-
bas
ename, getNumNodes(artwork_info->content_list));
+
file_list_entry->fil
ename, getNumNodes(artwork_info->content_list));
#endif
#if 1
#endif
#if 1
@@
-2775,7
+2792,7
@@
void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
for (i = 0; i < num_file_list_entries; i++)
{
#if 0
for (i = 0; i < num_file_list_entries; i++)
{
#if 0
- if (strcmp(file_list[i].token, "background") == 0)
+ if (strcmp(file_list[i].token, "background
.DOOR
") == 0)
printf("::: '%s' -> '%s'\n", file_list[i].token, file_list[i].filename);
#endif
printf("::: '%s' -> '%s'\n", file_list[i].token, file_list[i].filename);
#endif
@@
-2787,6
+2804,19
@@
void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
file_list[i].filename, i);
#endif
file_list[i].filename, i);
#endif
+#if 0
+ if (strcmp(file_list[i].token, "background.DOOR") == 0)
+ {
+ Bitmap *bitmap = getBitmapFromImageID(i);
+
+ printf("::: BITMAP: %08lx\n", bitmap);
+
+#if 0
+ BlitBitmap(bitmap, window, 0, 0, 100, 280, 0, 0);
+#endif
+ }
+#endif
+
#if 0
/* !!! NEW ARTWORK FALLBACK CODE !!! NEARLY UNTESTED !!! */
if (artwork_info->artwork_list[i] == NULL &&
#if 0
/* !!! NEW ARTWORK FALLBACK CODE !!! NEARLY UNTESTED !!! */
if (artwork_info->artwork_list[i] == NULL &&
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 78fd020039b03ff13ba6895e349387b51c2b8133..1206c9ad391ccc6633a706bd7f5c8013978fbd2a 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-213,6
+213,8
@@
static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile,
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
{
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
{
+ /* !!! THIS DOES NOT WORK !!! REPLACED BITMAPS MAY HAVE SAME ADDRESS !!! */
+#if 0
static Bitmap *main_bitmap_tile = NULL;
static Bitmap *door_bitmap_tile = NULL;
static Bitmap *main_bitmap_tile = NULL;
static Bitmap *door_bitmap_tile = NULL;
@@
-226,14
+228,15
@@
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
else if (mask == REDRAW_DOOR_1)
{
if (background_bitmap_tile == door_bitmap_tile)
else if (mask == REDRAW_DOOR_1)
{
if (background_bitmap_tile == door_bitmap_tile)
- return; /* main background tile has not changed */
+ return;
/* main background tile has not changed */
door_bitmap_tile = background_bitmap_tile;
}
door_bitmap_tile = background_bitmap_tile;
}
- else /* should not happen */
+ else
/* should not happen */
return;
return;
+#endif
- if (background_bitmap_tile)
+ if (background_bitmap_tile
!= NULL
)
gfx.background_bitmap_mask |= mask;
else
gfx.background_bitmap_mask &= ~mask;
gfx.background_bitmap_mask |= mask;
else
gfx.background_bitmap_mask &= ~mask;
@@
-249,10
+252,12
@@
void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask)
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.real_sx, gfx.real_sy,
gfx.full_sxsize, gfx.full_sysize);
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.real_sx, gfx.real_sy,
gfx.full_sxsize, gfx.full_sysize);
- else
+ else if (mask == REDRAW_DOOR_1)
+ {
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.dx, gfx.dy,
gfx.dxsize, gfx.dysize);
DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile,
gfx.dx, gfx.dy,
gfx.dxsize, gfx.dysize);
+ }
}
void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile)
}
void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile)
@@
-439,8
+444,13
@@
inline boolean DrawingDeactivated(int x, int y, int width, int height)
inline boolean DrawingOnBackground(int x, int y)
{
inline boolean DrawingOnBackground(int x, int y)
{
+#if 1
+ return (CheckDrawingArea(x, y, 1, 1, gfx.background_bitmap_mask) &&
+ CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
+#else
return ((gfx.draw_background_mask & gfx.background_bitmap_mask) &&
CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
return ((gfx.draw_background_mask & gfx.background_bitmap_mask) &&
CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
+#endif
}
inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
}
inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 903c982ca238b49f6cf10a2f86f2b1649450c743..6ced002e0f1c3992789d77b8eeb1fed1385c6efe 100644
(file)
--- a/
src/libgame/system.h
+++ b/
src/libgame/system.h
@@
-110,6
+110,7
@@
#define MV_VERTICAL (MV_UP | MV_DOWN)
#define MV_ALL_DIRECTIONS (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
#define MV_ANY_DIRECTION (MV_ALL_DIRECTIONS)
#define MV_VERTICAL (MV_UP | MV_DOWN)
#define MV_ALL_DIRECTIONS (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
#define MV_ANY_DIRECTION (MV_ALL_DIRECTIONS)
+#define MV_NO_DIRECTIONS (MV_NO_MOVING)
#define KEY_BUTTON_1 (1 << BUTTON_1)
#define KEY_BUTTON_2 (1 << BUTTON_2)
#define KEY_BUTTON_1 (1 << BUTTON_1)
#define KEY_BUTTON_2 (1 << BUTTON_2)