From ce530cead0b52cdf043b708617c0edc1dc37c1f0 Mon Sep 17 00:00:00 2001 From: stpohle Date: Fri, 27 Jun 2003 05:50:11 +0000 Subject: [PATCH] data directory was not installed right --- Makefile.am | 2 +- bomberclone.prj | 2 +- src/bomb.c | 2 +- src/configuration.c | 1 + src/player.c | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index c306e35..e148508 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ ## If you don't want it to overwrite it, ## Please disable it in the Anjuta project configuration -SUBDIRS = src +SUBDIRS = src data bomberclonedocdir = ${prefix}/doc/bomberclone bomberclonedoc_DATA = \ diff --git a/bomberclone.prj b/bomberclone.prj index 8351aa3..85fbbad 100644 --- a/bomberclone.prj +++ b/bomberclone.prj @@ -67,7 +67,7 @@ anjuta.program.arguments= project.config.blocked=0 -project.config.disable.overwriting=1 0 1 0 0 0 1 0 0 +project.config.disable.overwriting=1 1 1 0 0 0 1 0 0 project.config.extra.modules.before= project.config.extra.modules.after= diff --git a/src/bomb.c b/src/bomb.c index 1ce4faf..5b206b3 100644 --- a/src/bomb.c +++ b/src/bomb.c @@ -15,7 +15,7 @@ draw_bomb (_bomb * bomb) y = bomb->pos.y; if (x < 0 || y < 0 || x>>8 >= bman.fieldsize.x || y>>8 >= bman.fieldsize.y) { - d_fatal ("Draw Bomb out of range [%d,%d]\n", x, y); + d_printf ("FATAL: Draw Bomb out of range [%d,%d]\n", x, y); return; } diff --git a/src/configuration.c b/src/configuration.c index 974ea86..72b043c 100644 --- a/src/configuration.c +++ b/src/configuration.c @@ -52,6 +52,7 @@ game_init (int argc, char **argv) bman.fieldsize.x = 25; bman.fieldsize.y = 17; sprintf (bman.datapath, PACKAGE_DATA_DIR); + printf ("DataPath: %s\n", bman.datapath); bman.fieldpath[0] = 0; bman.random_map = 2; bman.firewall = 0; diff --git a/src/player.c b/src/player.c index f231457..7eac348 100644 --- a/src/player.c +++ b/src/player.c @@ -14,7 +14,7 @@ draw_player (_player * player) if ((player->pos.x >> 8) < 0 || (player->pos.x >> 8) >= bman.fieldsize.x || (player->pos.y >> 8) < 0 || (player->pos.y >> 8) >= bman.fieldsize.y) { - d_fatal ("Draw Player out of range : [%d,%d]\n", (player->pos.x >> 8), + d_printf ("FATAL: Draw Player out of range : [%d,%d]\n", (player->pos.x >> 8), (player->pos.y >> 8)); return; } @@ -91,7 +91,7 @@ restore_players_screen () if ((bman.players[i].old.x >> 8) < 0 || (bman.players[i].old.x >> 8) >= bman.fieldsize.x || (bman.players[i].old.y >> 8) < 0 || (bman.players[i].old.y >> 8) >= bman.fieldsize.y) - d_fatal ("Restore Player out of range : playernr %d [%d,%d]\n", i, + d_printf ("FATAL: Restore Player out of range : playernr %d [%d,%d]\n", i, (bman.players[i].old.x >> 8), (bman.players[i].old.y >> 8)); else { if ((bman.players[i].old.x & 0xFF) > 128) {