Reformat all C files.
I'll push a formatting guide at some point. There may still be outstanding changes, but please feel free to resolve those as you arrive a them. To the best of my knowledge, there is no changes to the actual code content, but the formatter does have the occasional bug. If you run into an issue, please fix it!
This commit is contained in:
Sean Hunt
+90
-87
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 tile2img.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.6 tile2img.c $NHDT-Date: 1431192775 2015/05/09 17:32:55 $ $NHDT-Branch: master $:$NHDT-Revision: 1.5 $ */
|
||||
/* NetHack 3.6 tile2img.c $Date: 2009/05/06 10:56:40 $ $Revision: 1.2 $ */
|
||||
/* SCCS Id: @(#)tile2bmp.c 3.2 95/09/06 */
|
||||
/* Copyright (c) NetHack PC Development Team 1995 */
|
||||
@@ -18,16 +18,15 @@
|
||||
#include "bitmfile.h"
|
||||
|
||||
/* #define COLORS_IN_USE MAXCOLORMAPSIZE /* 256 colors */
|
||||
#define COLORS_IN_USE 16 /* 16 colors */
|
||||
|
||||
#define COLORS_IN_USE 16 /* 16 colors */
|
||||
|
||||
extern char *FDECL(tilename, (int, int));
|
||||
static void FDECL(build_ximgtile,(pixel (*)[TILE_X]));
|
||||
static void FDECL(build_ximgtile, (pixel(*) [TILE_X]));
|
||||
void get_color(unsigned int colind, struct RGB *rgb);
|
||||
void get_pixel(int x, int y, unsigned int *colind);
|
||||
|
||||
#if COLORS_IN_USE==16
|
||||
#define MAX_X 320 /* 2 per byte, 4 bits per pixel */
|
||||
#if COLORS_IN_USE == 16
|
||||
#define MAX_X 320 /* 2 per byte, 4 bits per pixel */
|
||||
#else
|
||||
#define MAX_X 640
|
||||
#endif
|
||||
@@ -37,9 +36,9 @@ FILE *tibfile2;
|
||||
|
||||
pixel tilepixels[TILE_Y][TILE_X];
|
||||
|
||||
char *tilefiles[] = { "..\\win\\share\\monsters.txt",
|
||||
"..\\win\\share\\objects.txt",
|
||||
"..\\win\\share\\other.txt"};
|
||||
char *tilefiles[] = { "..\\win\\share\\monsters.txt",
|
||||
"..\\win\\share\\objects.txt",
|
||||
"..\\win\\share\\other.txt" };
|
||||
|
||||
unsigned int **Bild_daten;
|
||||
int num_colors = 0;
|
||||
@@ -48,7 +47,7 @@ int max_tiles_in_row = 40;
|
||||
int tiles_in_row;
|
||||
int filenum;
|
||||
int initflag;
|
||||
int yoffset,xoffset;
|
||||
int yoffset, xoffset;
|
||||
char bmpname[128];
|
||||
FILE *fp;
|
||||
|
||||
@@ -57,102 +56,106 @@ main(argc, argv)
|
||||
int argc;
|
||||
char *argv[];
|
||||
{
|
||||
int i;
|
||||
int i;
|
||||
|
||||
if (argc != 2) {
|
||||
Fprintf(stderr, "usage: tile2img outfile.img\n");
|
||||
exit(EXIT_FAILURE);
|
||||
} else
|
||||
strcpy(bmpname, argv[1]);
|
||||
if (argc != 2) {
|
||||
Fprintf(stderr, "usage: tile2img outfile.img\n");
|
||||
exit(EXIT_FAILURE);
|
||||
} else
|
||||
strcpy(bmpname, argv[1]);
|
||||
|
||||
#ifdef OBSOLETE
|
||||
bmpfile2 = fopen(NETHACK_PACKED_TILEFILE, WRBMODE);
|
||||
if (bmpfile2 == (FILE *)0) {
|
||||
Fprintf(stderr, "Unable to open output file %s\n",
|
||||
NETHACK_PACKED_TILEFILE);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
bmpfile2 = fopen(NETHACK_PACKED_TILEFILE, WRBMODE);
|
||||
if (bmpfile2 == (FILE *) 0) {
|
||||
Fprintf(stderr, "Unable to open output file %s\n",
|
||||
NETHACK_PACKED_TILEFILE);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
#endif
|
||||
|
||||
tilecount = 0;
|
||||
xoffset = yoffset = 0;
|
||||
initflag = 0;
|
||||
filenum = 0;
|
||||
fp = fopen(bmpname,"wb");
|
||||
if (!fp) {
|
||||
printf("Error creating tile file %s, aborting.\n",bmpname);
|
||||
exit(1);
|
||||
}
|
||||
fclose(fp);
|
||||
tilecount = 0;
|
||||
xoffset = yoffset = 0;
|
||||
initflag = 0;
|
||||
filenum = 0;
|
||||
fp = fopen(bmpname, "wb");
|
||||
if (!fp) {
|
||||
printf("Error creating tile file %s, aborting.\n", bmpname);
|
||||
exit(1);
|
||||
}
|
||||
fclose(fp);
|
||||
|
||||
Bild_daten=(unsigned int **)malloc(MAX_Y*sizeof(unsigned int *));
|
||||
for(i=0;i<MAX_Y;i++)
|
||||
Bild_daten[i]=(unsigned int *)malloc(MAX_X*sizeof(unsigned int));
|
||||
Bild_daten = (unsigned int **) malloc(MAX_Y * sizeof(unsigned int *));
|
||||
for (i = 0; i < MAX_Y; i++)
|
||||
Bild_daten[i] = (unsigned int *) malloc(MAX_X * sizeof(unsigned int));
|
||||
|
||||
while (filenum < 3) {
|
||||
if (!fopen_text_file(tilefiles[filenum], RDTMODE)) {
|
||||
Fprintf(stderr,
|
||||
"usage: tile2img (from the util directory)\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
num_colors = colorsinmap;
|
||||
if (num_colors > 62) {
|
||||
Fprintf(stderr, "too many colors (%d)\n", num_colors);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
while (read_text_tile(tilepixels)) {
|
||||
build_ximgtile(tilepixels);
|
||||
tilecount++;
|
||||
xoffset += TILE_X;
|
||||
if (xoffset >= MAX_X) {
|
||||
yoffset += TILE_Y;
|
||||
xoffset = 0;
|
||||
}
|
||||
}
|
||||
(void) fclose_text_file();
|
||||
++filenum;
|
||||
}
|
||||
Fprintf(stderr, "Total of %d tiles in memory.\n",tilecount);
|
||||
while (filenum < 3) {
|
||||
if (!fopen_text_file(tilefiles[filenum], RDTMODE)) {
|
||||
Fprintf(stderr, "usage: tile2img (from the util directory)\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
num_colors = colorsinmap;
|
||||
if (num_colors > 62) {
|
||||
Fprintf(stderr, "too many colors (%d)\n", num_colors);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
while (read_text_tile(tilepixels)) {
|
||||
build_ximgtile(tilepixels);
|
||||
tilecount++;
|
||||
xoffset += TILE_X;
|
||||
if (xoffset >= MAX_X) {
|
||||
yoffset += TILE_Y;
|
||||
xoffset = 0;
|
||||
}
|
||||
}
|
||||
(void) fclose_text_file();
|
||||
++filenum;
|
||||
}
|
||||
Fprintf(stderr, "Total of %d tiles in memory.\n", tilecount);
|
||||
|
||||
bitmap_to_file(XIMG, MAX_X, (tilecount/20+1)*16, 372, 372, 4, 16, bmpname, get_color, get_pixel ) ;
|
||||
bitmap_to_file(XIMG, MAX_X, (tilecount / 20 + 1) * 16, 372, 372, 4, 16,
|
||||
bmpname, get_color, get_pixel);
|
||||
|
||||
Fprintf(stderr, "Total of %d tiles written to %s.\n",tilecount, bmpname);
|
||||
Fprintf(stderr, "Total of %d tiles written to %s.\n", tilecount, bmpname);
|
||||
|
||||
exit(EXIT_SUCCESS);
|
||||
/*NOTREACHED*/
|
||||
return 0;
|
||||
exit(EXIT_SUCCESS);
|
||||
/*NOTREACHED*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
void get_color(unsigned int colind, struct RGB *rgb){
|
||||
rgb->r=(1000L*(long)ColorMap[CM_RED][colind])/0xFF;
|
||||
rgb->g=(1000L*(long)ColorMap[CM_GREEN][colind])/0xFF;
|
||||
rgb->b=(1000L*(long)ColorMap[CM_BLUE][colind])/0xFF;
|
||||
void
|
||||
get_color(unsigned int colind, struct RGB *rgb)
|
||||
{
|
||||
rgb->r = (1000L * (long) ColorMap[CM_RED][colind]) / 0xFF;
|
||||
rgb->g = (1000L * (long) ColorMap[CM_GREEN][colind]) / 0xFF;
|
||||
rgb->b = (1000L * (long) ColorMap[CM_BLUE][colind]) / 0xFF;
|
||||
}
|
||||
|
||||
void get_pixel(int x, int y, unsigned int *colind){
|
||||
*colind=Bild_daten[y][x];
|
||||
void
|
||||
get_pixel(int x, int y, unsigned int *colind)
|
||||
{
|
||||
*colind = Bild_daten[y][x];
|
||||
}
|
||||
|
||||
static void
|
||||
build_ximgtile(pixels)
|
||||
pixel (*pixels)[TILE_X];
|
||||
{
|
||||
int cur_x, cur_y, cur_color;
|
||||
int x,y;
|
||||
int cur_x, cur_y, cur_color;
|
||||
int x, y;
|
||||
|
||||
for (cur_y = 0; cur_y < TILE_Y; cur_y++) {
|
||||
for (cur_x = 0; cur_x < TILE_X; cur_x++) {
|
||||
for (cur_color = 0; cur_color < num_colors; cur_color++) {
|
||||
if (ColorMap[CM_RED][cur_color] == pixels[cur_y][cur_x].r &&
|
||||
ColorMap[CM_GREEN][cur_color] == pixels[cur_y][cur_x].g &&
|
||||
ColorMap[CM_BLUE][cur_color] == pixels[cur_y][cur_x].b)
|
||||
break;
|
||||
}
|
||||
if (cur_color >= num_colors)
|
||||
Fprintf(stderr, "color not in colormap!\n");
|
||||
y = cur_y + yoffset;
|
||||
x = cur_x + xoffset;
|
||||
Bild_daten[y][x] =cur_color;
|
||||
}
|
||||
}
|
||||
for (cur_y = 0; cur_y < TILE_Y; cur_y++) {
|
||||
for (cur_x = 0; cur_x < TILE_X; cur_x++) {
|
||||
for (cur_color = 0; cur_color < num_colors; cur_color++) {
|
||||
if (ColorMap[CM_RED][cur_color] == pixels[cur_y][cur_x].r
|
||||
&& ColorMap[CM_GREEN][cur_color] == pixels[cur_y][cur_x].g
|
||||
&& ColorMap[CM_BLUE][cur_color] == pixels[cur_y][cur_x].b)
|
||||
break;
|
||||
}
|
||||
if (cur_color >= num_colors)
|
||||
Fprintf(stderr, "color not in colormap!\n");
|
||||
y = cur_y + yoffset;
|
||||
x = cur_x + xoffset;
|
||||
Bild_daten[y][x] = cur_color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user