nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Reformat all C files.

Browse Source 
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
2015-05-09 13:43:16 -04:00
parent 167800afdf
commit 97d6fade74
270 changed files with 182649 additions and 173878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/gnome/gnglyph.c
+65 -74
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 gnglyph.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.6 gnglyph.c $NHDT-Date: 1431192772 2015/05/09 17:32:52 $ $NHDT-Branch: master $:$NHDT-Revision: 1.9 $ */
/* NetHack 3.6 gnglyph.c $Date: 2009/05/06 10:57:29 $ $Revision: 1.6 $ */
/* SCCS Id: @(#)gnglyph.c 3.5 2000/07/16 */
/* Copyright (C) 1998 by Erik Andersen <andersee@debian.org> */
@@ -10,8 +10,8 @@
/* from tile.c */
extern int total_tiles_used;
static GHackGlyphs ghack_glyphs;
static GdkImlibImage** ghack_tiles = NULL;
static GHackGlyphs ghack_glyphs;
static GdkImlibImage **ghack_tiles = NULL;
/* NAME:
* ghack_init_glyphs(char* xpm_file)
@@ -53,47 +53,46 @@ int
ghack_init_glyphs(const char *xpmFile)
{
ghack_glyphs.im = gdk_imlib_load_image((char *) xpmFile);
if ( ! ghack_glyphs.im ) {
g_error("Couldn't load required xpmFile!");
return -1;
if (!ghack_glyphs.im) {
g_error("Couldn't load required xpmFile!");
return -1;
}
gdk_imlib_render(ghack_glyphs.im, ghack_glyphs.im->rgb_width,
ghack_glyphs.im->rgb_height);
ghack_glyphs.im->rgb_height);
if ((ghack_glyphs.im->rgb_width % TILES_PER_ROW) != 0 ||
ghack_glyphs.im->rgb_width <= TILES_PER_ROW) {
g_error("%s is not a multiple of %d (number of tiles/row) pixels wide",
xpmFile, TILES_PER_ROW);
return -1;
if ((ghack_glyphs.im->rgb_width % TILES_PER_ROW) != 0
|| ghack_glyphs.im->rgb_width <= TILES_PER_ROW) {
g_error(
"%s is not a multiple of %d (number of tiles/row) pixels wide",
xpmFile, TILES_PER_ROW);
return -1;
}
ghack_glyphs.count = total_tiles_used;
if ((ghack_glyphs.count % TILES_PER_ROW) != 0) {
ghack_glyphs.count +=
TILES_PER_ROW - (ghack_glyphs.count % TILES_PER_ROW);
ghack_glyphs.count +=
TILES_PER_ROW - (ghack_glyphs.count % TILES_PER_ROW);
}
ghack_glyphs.width = ghack_glyphs.im->rgb_width / TILES_PER_ROW;
ghack_glyphs.height =
ghack_glyphs.im->rgb_height / (ghack_glyphs.count / TILES_PER_ROW);
ghack_glyphs.im->rgb_height / (ghack_glyphs.count / TILES_PER_ROW);
/* Assume the tiles are organized in rows of TILES_PER_ROW */
ghack_tiles = g_new0( GdkImlibImage*, ghack_glyphs.count );
ghack_tiles = g_new0(GdkImlibImage *, ghack_glyphs.count);
return (ghack_tiles == NULL) ? -1 : 0;
}
void
ghack_free_glyphs( )
ghack_free_glyphs()
{
int i;
for ( i=0 ; i<ghack_glyphs.count ; i++)
gdk_imlib_destroy_image(ghack_tiles[i]);
g_free( ghack_tiles);
for (i = 0; i < ghack_glyphs.count; i++)
gdk_imlib_destroy_image(ghack_tiles[i]);
g_free(ghack_tiles);
gdk_imlib_destroy_image(ghack_glyphs.im);
ghack_glyphs.im=NULL;
ghack_glyphs.im = NULL;
}
/* NAME:
* ghack_glyph_count( )
*
@@ -108,12 +107,11 @@ ghack_free_glyphs( )
*/
int
ghack_glyph_count( )
ghack_glyph_count()
{
return ghack_glyphs.count;
return ghack_glyphs.count;
}
/* NAME:
* ghack_glyph_height()
*
@@ -130,10 +128,9 @@ ghack_glyph_count( )
int
ghack_glyph_height()
{
return ghack_glyphs.height;
return ghack_glyphs.height;
}
/* NAME:
* ghack_glyph_width()
*
@@ -150,10 +147,9 @@ ghack_glyph_height()
int
ghack_glyph_width()
{
return ghack_glyphs.width;
return ghack_glyphs.width;
}
/* NAME:
* ghack_image_from_glyph( int glyph, gboolean force)
*
@@ -168,38 +164,36 @@ ghack_glyph_width()
* Decodes the glyph into an image suitable for manipulation
*/
GdkImlibImage*
ghack_image_from_glyph( int glyph, gboolean force )
GdkImlibImage *
ghack_image_from_glyph(int glyph, gboolean force)
{
int tile = glyph2tile[glyph];
int tile = glyph2tile[glyph];
if ( tile >= ghack_glyphs.count || tile < 0 )
{
g_warning("Aiiee! I've was asked for a tile outside the allowed range!\n"
"Email this to other-gnomehack@lists.debian.org");
g_warning("Max tile: %d Tile asked for: %d",
ghack_glyphs.count, tile);
return NULL;
if (tile >= ghack_glyphs.count || tile < 0) {
g_warning(
"Aiiee! I've was asked for a tile outside the allowed range!\n"
"Email this to other-gnomehack@lists.debian.org");
g_warning("Max tile: %d Tile asked for: %d", ghack_glyphs.count,
tile);
return NULL;
}
if (ghack_glyphs.im == NULL)
{
g_warning("Aiiee! I've been asked to clone from a null image.\n"
"Email this to other-gnomehack@lists.debian.org");
g_warning( "making image from tile %d, force=%s\n", tile,
(force==TRUE)? "TRUE": "FALSE");
if (ghack_glyphs.im == NULL) {
g_warning("Aiiee! I've been asked to clone from a null image.\n"
"Email this to other-gnomehack@lists.debian.org");
g_warning("making image from tile %d, force=%s\n", tile,
(force == TRUE) ? "TRUE" : "FALSE");
}
if (force == TRUE)
{
g_warning("Aiiee! I've been asked to force rendering.\n"
"Email this to other-gnomehack@lists.debian.org");
g_warning( "making image from tile %d, force=%s\n", tile,
(force==TRUE)? "TRUE" : "FALSE");
if (force == TRUE) {
g_warning("Aiiee! I've been asked to force rendering.\n"
"Email this to other-gnomehack@lists.debian.org");
g_warning("making image from tile %d, force=%s\n", tile,
(force == TRUE) ? "TRUE" : "FALSE");
}
if (!ghack_tiles[tile] || force) {
int src_x, src_y;
if (!ghack_tiles[tile] || force) {
int src_x, src_y;
#if 0
fprintf( stderr, "crop_and_clone: glyph=%d, tile=%d, ptr=%p, x=%d, y=%d, w=%d, h=%d\n", glyph, tile,
(void*)&(ghack_tiles[tile]), 0,
@@ -207,26 +201,23 @@ ghack_image_from_glyph( int glyph, gboolean force )
ghack_glyphs.height,
ghack_glyphs.width);
#endif
if (ghack_glyphs.im->pixmap == NULL)
g_warning( "Aiiee! ghack_glyphs.im->pixmap==NULL!!!!\n");
src_x = (tile % TILES_PER_ROW) * ghack_glyphs.width;
src_y = (tile / TILES_PER_ROW) * ghack_glyphs.height;
ghack_tiles[tile] = gdk_imlib_crop_and_clone_image(ghack_glyphs.im,
src_x, src_y,
ghack_glyphs.width,
ghack_glyphs.height);
}
if (ghack_glyphs.im->pixmap == NULL)
g_warning("Aiiee! ghack_glyphs.im->pixmap==NULL!!!!\n");
src_x = (tile % TILES_PER_ROW) * ghack_glyphs.width;
src_y = (tile / TILES_PER_ROW) * ghack_glyphs.height;
ghack_tiles[tile] = gdk_imlib_crop_and_clone_image(
ghack_glyphs.im, src_x, src_y, ghack_glyphs.width,
ghack_glyphs.height);
}
if (ghack_tiles[tile] && (!ghack_tiles[tile]->pixmap || force))
{
if ( gdk_imlib_render(ghack_tiles[tile],
ghack_tiles[tile]->rgb_width,
ghack_tiles[tile]->rgb_height) == 0) {
g_error("GLYPH: couldn't create tile # %d", tile);
}
if ( !ghack_tiles[tile]->pixmap )
g_error("Strange, tile # %d didn't get rendered???", tile);
}
if (ghack_tiles[tile] && (!ghack_tiles[tile]->pixmap || force)) {
if (gdk_imlib_render(ghack_tiles[tile], ghack_tiles[tile]->rgb_width,
ghack_tiles[tile]->rgb_height) == 0) {
g_error("GLYPH: couldn't create tile # %d", tile);
}
if (!ghack_tiles[tile]->pixmap)
g_error("Strange, tile # %d didn't get rendered???", tile);
}
return ghack_tiles[tile];
return ghack_tiles[tile];
}