$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:44 agc Exp $ --- xbomber.c.orig Fri Jun 19 19:09:35 1998 +++ xbomber.c Thu Jul 23 07:41:03 1998 @@ -1601,3 +1601,3 @@ use_color = 0; - strcpy(graphicsset, "./pixmaps"); + strcpy(graphicsset, "PIXMAPS"); @@ -1685,3 +1685,3 @@ { - sprintf(file, "sounds/%s.au", sound_names[i]); + sprintf(file, "%s/%s.au",SOUNDS, sound_names[i]); @@ -1722,3 +1722,3 @@ { - sprintf(file, "sounds/numbers/%s.au", nsound_names[i]); + sprintf(file, "%s/numbers/%s.au",SOUNDS, nsound_names[i]); @@ -2071,2 +2071,3 @@ char file[128]; + char temp[128]; int status, temp_depth; @@ -2097,4 +2098,4 @@ /* Make cursor: */ - - ret = XReadBitmapFile(display[pln], window[pln], "bitmaps/cursor.xbm", + sprintf(temp,"%s/cursor.xbm",BITMAPS); + ret = XReadBitmapFile(display[pln], window[pln], temp, &tempint1, &tempint2, &cursor_pixmap[pln], @@ -2104,7 +2105,7 @@ { - perror("bitmaps/cursor.xbm"); + perror(temp); exit(1); } - - ret = XReadBitmapFile(display[pln], window[pln], "bitmaps/cursor-mask.xbm", + sprintf(temp,"%s/cursor-mask.xbm",BITMAPS); + ret = XReadBitmapFile(display[pln], window[pln], temp, &tempint1, &tempint2, &cursor_mask[pln], @@ -2114,3 +2115,3 @@ { - perror("bitmaps/cursor-mask.xbm"); + perror(temp); exit(1); @@ -2151,3 +2152,3 @@ - sprintf(file, "bitmaps/%s.xbm", object_names[i]); + sprintf(file, "%s/%s.xbm",BITMAPS,object_names[i]); @@ -2865,3 +2866,3 @@ - sprintf(filename, "levels/level%.2d.dat", level); + sprintf(filename, "%s/level%.2d.dat",LEVELS, level); @@ -3295,3 +3296,3 @@ { - sprintf(file, "%s/%s.ppm", graphicsset, object_names[i]); + sprintf(file, "%s/%s/%s.ppm",PIXMAPS, graphicsset, object_names[i]); fi = fopen(file, "r"); @@ -3305,3 +3306,3 @@ - sprintf(file, "pixmaps/%s.ppm", object_names[i]); + sprintf(file, "%s/%s.ppm",PIXMAPS, object_names[i]);