From: Carl Worth Date: Fri, 27 Jun 2003 03:13:15 +0000 (+0000) Subject: Resized the graphics slightly. The walls are thinner, the padding is smaller, and X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=cde4dcdfac0aa34436ff8741472d994041487fd2;p=grrobot Resized the graphics slightly. The walls are thinner, the padding is smaller, and the targets and robots are a bit larger. Also, added black trim around all solid-color targets. Removed "manual" drawing of grid, incorporating it into cell.svg instead. Better message when the server goes away. --- diff --git a/TODO b/TODO index 12c0e33..aea8b2c 100644 --- a/TODO +++ b/TODO @@ -17,3 +17,6 @@ Add keybindings, (RGBY for robot selection, arrows for robot movement, PG UP/DN for message scrolling, numbers for bids, some key for message input, etc.) +This is definitely happening even with the latest nickle: + +nickle: sched.c:622: ContinuationMark: Assertion `!continuation->pc || ((((InstPtr) (continuation->obj + 1)) + (0)) <= continuation->pc && continuation->pc <= (((InstPtr) (continuation->obj + 1)) + (((continuation->obj)->used - 1))))' failed. diff --git a/src/grr_board_view.c b/src/grr_board_view.c index e06f279..863ac20 100644 --- a/src/grr_board_view.c +++ b/src/grr_board_view.c @@ -305,8 +305,8 @@ grr_board_view_draw_cell (grr_board_view_t *view, grr_board_view_draw_walls (view, xrs, RR_CELL_GET_WALLS (cell)); XrRestore (xrs); - xpad = width / 5; - ypad = width / 5; + xpad = width / 10; + ypad = width / 10; XrSave (xrs); XrTranslate (xrs, xpad, ypad); @@ -328,9 +328,9 @@ grr_board_view_draw_cell (grr_board_view_t *view, XrScale (xrs, width / GRR_SVG_ASSUMED_WIDTH, height / GRR_SVG_ASSUMED_HEIGHT); - XrRectangle (xrs, 0, 0, - GRR_SVG_ASSUMED_WIDTH, - GRR_SVG_ASSUMED_HEIGHT); + XrRectangle (xrs, 1, 1, + GRR_SVG_ASSUMED_WIDTH - 1, + GRR_SVG_ASSUMED_HEIGHT - 1); XrSetRGBColor (xrs, 1, 1, 1); XrSetAlpha (xrs, 0.75); XrFill (xrs); @@ -457,23 +457,6 @@ grr_board_view_expose (GtkWidget *widget, } } - /* Draw grid. */ - XrSave (xrs); - { - XrSetRGBColor (xrs, .75, .75, 1); - XrSetLineWidth (xrs, 1); - for (j=0; j < view->board_height; j++) { - XrMoveTo (xrs, 0, j * view->cell_height + 0.5); - XrRelLineTo (xrs, view->board_width * view->cell_width, 0); - } - for (i=0; i < view->board_width; i++) { - XrMoveTo (xrs, i * view->cell_width + 0.5, 0); - XrRelLineTo (xrs, 0, view->board_height * view->cell_height); - } - XrStroke (xrs); - } - XrRestore (xrs); - /* Draw goal target in center of board */ XrSave (xrs); { diff --git a/src/grr_board_view.h b/src/grr_board_view.h index 8a0ffd1..523cd25 100644 --- a/src/grr_board_view.h +++ b/src/grr_board_view.h @@ -70,6 +70,7 @@ struct grr_board_view grr_icon_t *cell_icon; grr_icon_t *wall_icon; + grr_icon_t *robot_icon[RR_NUM_ROBOTS]; grr_icon_t *target_icon[RR_NUM_TARGETS]; }; diff --git a/src/grrobot.c b/src/grrobot.c index 2f3b533..903a164 100644 --- a/src/grrobot.c +++ b/src/grrobot.c @@ -188,9 +188,12 @@ grr_game_read_notices (grr_game_t *game) while (rr_client_notice_pending (game->client)) { status = rr_client_next_notice (game->client, ¬ice); if (status) { - fprintf (stderr, "Error during rr_client_next_notice: %s\n", - rr_status_str (status)); - exit (1); + if (status == RR_STATUS_EOF) + fprintf (stderr, "The server has disconnected, exiting.\n"); + else + fprintf (stderr, "Error during rr_client_next_notice: %s\n", + rr_status_str (status)); + gtk_exit (1); } if (!notice) { fprintf (stderr, "Missing notice\n"); diff --git a/src/svg/cell.svg b/src/svg/cell.svg index 9a59739..502e4b0 100644 --- a/src/svg/cell.svg +++ b/src/svg/cell.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/grr_icon_svg.h b/src/svg/grr_icon_svg.h index f33e575..40facfa 100644 --- a/src/svg/grr_icon_svg.h +++ b/src/svg/grr_icon_svg.h @@ -1,23 +1,23 @@ -static char GRR_ICON_SVG_CELL[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_CELL[] = "\012\012\012\040\040\012\012"; static char GRR_ICON_SVG_ROBOT_BLUE[] = "\015\012\015\012\015\012\015\012\011Tux\015\012\011The\040Linux\040Penguin\040in\040SVG.\015\012\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_ROBOT_GREEN[] = "\015\012\015\012\015\012\015\012\011Tux\015\012\011The\040Linux\040Penguin\040in\040SVG.\015\012\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_ROBOT_RED[] = "\015\012\015\012\015\012\015\012\011Tux\015\012\011The\040Linux\040Penguin\040in\040SVG.\015\012\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\015\012"; static char GRR_ICON_SVG_ROBOT_YELLOW[] = "\015\012\015\012\015\012\015\012\011Tux\015\012\011The\040Linux\040Penguin\040in\040SVG.\015\012\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\011\015\012\011\011\015\012\011\015\012\015\012"; -static char GRR_ICON_SVG_TARGET_BLUE_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_BLUE_OCTAGON[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_BLUE_SQUARE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_BLUE_TRIANGLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_GREEN_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_GREEN_OCTAGON[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_GREEN_SQUARE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_GREEN_TRIANGLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_RED_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_RED_OCTAGON[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_RED_SQUARE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_RED_TRIANGLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_BLUE_CIRCLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_BLUE_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_BLUE_SQUARE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_BLUE_TRIANGLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_GREEN_CIRCLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_GREEN_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_GREEN_SQUARE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_GREEN_TRIANGLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_RED_CIRCLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_RED_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_RED_SQUARE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_RED_TRIANGLE[] = "\012\012\012\040\040\012\012"; static char GRR_ICON_SVG_TARGET_WHIRL[] = "\012\012\012\040\040\012\040\040\012\040\040\012\040\040\012\012\012"; -static char GRR_ICON_SVG_TARGET_YELLOW_CIRCLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_YELLOW_OCTAGON[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_YELLOW_SQUARE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_TARGET_YELLOW_TRIANGLE[] = "\012\012\012\040\040\012\012"; -static char GRR_ICON_SVG_WALL[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_YELLOW_CIRCLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_YELLOW_OCTAGON[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_YELLOW_SQUARE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_TARGET_YELLOW_TRIANGLE[] = "\012\012\012\040\040\012\012"; +static char GRR_ICON_SVG_WALL[] = "\012\012\012\040\040\012\012"; diff --git a/src/svg/target_blue_circle.svg b/src/svg/target_blue_circle.svg index 8567a4f..ff1249d 100644 --- a/src/svg/target_blue_circle.svg +++ b/src/svg/target_blue_circle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_blue_octagon.svg b/src/svg/target_blue_octagon.svg index bac739b..8e24724 100644 --- a/src/svg/target_blue_octagon.svg +++ b/src/svg/target_blue_octagon.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_blue_square.svg b/src/svg/target_blue_square.svg index 5f3555b..85787e5 100644 --- a/src/svg/target_blue_square.svg +++ b/src/svg/target_blue_square.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_blue_triangle.svg b/src/svg/target_blue_triangle.svg index 68d0b3b..de5956f 100644 --- a/src/svg/target_blue_triangle.svg +++ b/src/svg/target_blue_triangle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_green_circle.svg b/src/svg/target_green_circle.svg index 64cd2ee..12c8fda 100644 --- a/src/svg/target_green_circle.svg +++ b/src/svg/target_green_circle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_green_octagon.svg b/src/svg/target_green_octagon.svg index 1d64e44..49978b3 100644 --- a/src/svg/target_green_octagon.svg +++ b/src/svg/target_green_octagon.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_green_square.svg b/src/svg/target_green_square.svg index 71c9c6a..a8d296b 100644 --- a/src/svg/target_green_square.svg +++ b/src/svg/target_green_square.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_green_triangle.svg b/src/svg/target_green_triangle.svg index 7dd26b3..b147a69 100644 --- a/src/svg/target_green_triangle.svg +++ b/src/svg/target_green_triangle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_red_circle.svg b/src/svg/target_red_circle.svg index 19f7615..0a5bed1 100644 --- a/src/svg/target_red_circle.svg +++ b/src/svg/target_red_circle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_red_octagon.svg b/src/svg/target_red_octagon.svg index 5fe9714..0932465 100644 --- a/src/svg/target_red_octagon.svg +++ b/src/svg/target_red_octagon.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_red_square.svg b/src/svg/target_red_square.svg index d84253f..bb4f257 100644 --- a/src/svg/target_red_square.svg +++ b/src/svg/target_red_square.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_red_triangle.svg b/src/svg/target_red_triangle.svg index 37a7398..80003f9 100644 --- a/src/svg/target_red_triangle.svg +++ b/src/svg/target_red_triangle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_yellow_circle.svg b/src/svg/target_yellow_circle.svg index 07de788..2aab71b 100644 --- a/src/svg/target_yellow_circle.svg +++ b/src/svg/target_yellow_circle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_yellow_octagon.svg b/src/svg/target_yellow_octagon.svg index 44ffde5..da151d6 100644 --- a/src/svg/target_yellow_octagon.svg +++ b/src/svg/target_yellow_octagon.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_yellow_square.svg b/src/svg/target_yellow_square.svg index 0eb0f98..6e91f95 100644 --- a/src/svg/target_yellow_square.svg +++ b/src/svg/target_yellow_square.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/target_yellow_triangle.svg b/src/svg/target_yellow_triangle.svg index 36fd483..9e0b847 100644 --- a/src/svg/target_yellow_triangle.svg +++ b/src/svg/target_yellow_triangle.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/w b/src/svg/w deleted file mode 100644 index 2a61fe5..0000000 --- a/src/svg/w +++ /dev/null @@ -1,77 +0,0 @@ --2 -3 --2 -3 --2 -3 --2 -3 --2 -3 --2 -3 --2 -3 -34 39 --2 -3 -37.038 40.055 -36.145 43.645 -34 44.987 --2 -3 -29.471 47.821 -24.127 43.762 -22.75 39 --2 -3 -20.313 31.574 -26.529 24.045 -34 22.487 --2 -3 -44.896 20.213 -54.852 28.829 -56.5 39 --2 -3 -58.687 53.337 -47.594 65.785 -34 67.487 --2 -3 -16.954 69.621 -1.988 56.017 -0 39 --2 -3 --1.848 19.247 -14.283 1.75 -34 0 --2 -3 -57.181 -2.086 -77.218 16.581 -79 39 --2 -3 -79.156 69.947 -52.437 84.323 -34 84 --2 -3 -56.775 82.5 -75.372 62.399 -73.219 39.225 --2 -3 -71.388 19.513 -53.834 3.443 -33.727 5.612 --2 -3 -17.078 7.407 -3.526 22.42 -5.719 39.459 --2 -3 -7.468 53.047 -19.954 64.097 -33.922 61.862 --2 -3 -44.449 60.177 -53.03 50.191 -50.719 39.303 --2 -3 -49.134 31.837 -41.584 25.647 -33.805 28.112 --2 -3 -29.41 29.504 -25.369 34.862 -28.219 39.381 --2 -3 -29.569 41.521 -33.278 42.363 -34 39 --2 -3 diff --git a/src/svg/wall.svg b/src/svg/wall.svg index 98de7d7..4f8112a 100644 --- a/src/svg/wall.svg +++ b/src/svg/wall.svg @@ -2,5 +2,5 @@ - + diff --git a/src/svg/x.svg b/src/svg/x.svg deleted file mode 100644 index 7dc9f04..0000000 --- a/src/svg/x.svg +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - - -