diff options
| author | xHire <xhire@tuxportal.cz> | 2008-10-25 14:11:06 +0200 |
|---|---|---|
| committer | xHire <xhire@tuxportal.cz> | 2008-10-25 14:11:06 +0200 |
| commit | c8a9209d77a896bf49227e5aeccd54e91ccf29cc (patch) | |
| tree | 6b7367406ebbc6ce3ea5e0c8668c75f6fb3f6ae9 /src/client/image.c | |
| parent | cb9deba915dd7b114eeb76601eb1c8b07c1ba90f (diff) | |
Changed style of the code to the K&R standard
Diffstat (limited to 'src/client/image.c')
| -rw-r--r-- | src/client/image.c | 174 |
1 files changed, 81 insertions, 93 deletions
diff --git a/src/client/image.c b/src/client/image.c index 3ed4403..6046732 100644 --- a/src/client/image.c +++ b/src/client/image.c @@ -14,82 +14,76 @@ static list_t *listStorage; static bool_t isImageDataInit = FALSE; -bool_t -isImageInicialized() +bool_t isImageInicialized() { - return isImageDataInit; + return isImageDataInit; } /* * Inicializuje globalny zoznam obrazkov */ -void -initImageData() +void initImageData() { - assert(isInterfaceInicialized() == TRUE); + assert(isInterfaceInicialized() == TRUE); #ifdef DEBUG - printf(_("Initializing image database\n")); + printf(_("Initializing image database\n")); #endif - listStorage = newStorage(); - isImageDataInit = TRUE; + listStorage = newStorage(); + isImageDataInit = TRUE; } -static SDL_Surface * -loadImage(const char *filename, int alpha) +static SDL_Surface *loadImage(const char *filename, int alpha) { - SDL_Surface *tmp; - SDL_Surface *ret; + SDL_Surface *tmp; + SDL_Surface *ret; - char str[STR_PATH_SIZE]; + char str[STR_PATH_SIZE]; - if (isFillPath(filename)) { - strcpy(str, filename); - } - else { - sprintf(str, PATH_IMAGE "%s", filename); - } + if (isFillPath(filename)) { + strcpy(str, filename); + } else { + sprintf(str, PATH_IMAGE "%s", filename); + } - accessExistFile(str); + accessExistFile(str); - if ((tmp = IMG_Load(str)) == NULL) { - fprintf(stderr, "%s\n", SDL_GetError()); - return NULL; - } + if ((tmp = IMG_Load(str)) == NULL) { + fprintf(stderr, "%s\n", SDL_GetError()); + return NULL; + } - if ((ret = - (alpha) ? SDL_DisplayFormatAlpha(tmp) : SDL_DisplayFormat(tmp)) == - NULL) { - fprintf(stderr, "%s\n", SDL_GetError()); - SDL_FreeSurface(tmp); - return NULL; - } + if ((ret = + (alpha) ? SDL_DisplayFormatAlpha(tmp) : SDL_DisplayFormat(tmp)) == + NULL) { + fprintf(stderr, "%s\n", SDL_GetError()); + SDL_FreeSurface(tmp); + return NULL; + } - SDL_FreeSurface(tmp); - return ret; + SDL_FreeSurface(tmp); + return ret; } -image_t * -newImage(SDL_Surface * surface) +image_t *newImage(SDL_Surface * surface) { - image_t *new; + image_t *new; - assert(surface != NULL); + assert(surface != NULL); - new = malloc(sizeof(image_t)); - new->image = surface; - new->w = surface->w; - new->h = surface->h; + new = malloc(sizeof(image_t)); + new->image = surface; + new->w = surface->w; + new->h = surface->h; - return new; + return new; } -static void -destroyImage(image_t * p) +static void destroyImage(image_t * p) { - assert(p != NULL); - SDL_FreeSurface((SDL_Surface *) p->image); - free(p); + assert(p != NULL); + SDL_FreeSurface((SDL_Surface *) p->image); + free(p); } /* @@ -98,86 +92,80 @@ destroyImage(image_t * p) * *name - nazov obrazku ( pouzije sa ako vyhadavaci retazec v zazanem ) * alpha - 0 - nema alpha kanal | 1 - ma alpha kanal */ -image_t * -addImageData(char *file, int alpha, char *name, char *group) +image_t *addImageData(char *file, int alpha, char *name, char *group) { - SDL_Surface *surface; - image_t *new; + SDL_Surface *surface; + image_t *new; - assert(file != NULL); - assert(name != NULL); - assert(group != NULL); + assert(file != NULL); + assert(name != NULL); + assert(group != NULL); - surface = loadImage(file, alpha); - new = newImage(surface); + surface = loadImage(file, alpha); + new = newImage(surface); - addItemToStorage(listStorage, group, name, new); + addItemToStorage(listStorage, group, name, new); #ifdef DEBUG - printf(_("Loading image %s\n"), file); + printf(_("Loading image %s\n"), file); #endif - return new; + return new; } /* * Vrati odkaz na image_data v globalnom zozname obrazkov * a nazvom *s */ -image_t * -getImage(char *group, char *name) +image_t *getImage(char *group, char *name) { - assert(group != NULL); - assert(name != NULL); + assert(group != NULL); + assert(name != NULL); - return getItemFromStorage(listStorage, group, name); + return getItemFromStorage(listStorage, group, name); } -void -delImage(char *group, char *name) +void delImage(char *group, char *name) { - assert(group != NULL); - assert(name != NULL); + assert(group != NULL); + assert(name != NULL); - delItemFromStorage(listStorage, group, name, destroyImage); + delItemFromStorage(listStorage, group, name, destroyImage); } -void -delAllImageInGroup(char *group) +void delAllImageInGroup(char *group) { - assert(group != NULL); + assert(group != NULL); - delAllItemFromStorage(listStorage, group, destroyImage); + delAllItemFromStorage(listStorage, group, destroyImage); } -void -drawImage(image_t * p, int x, int y, int px, int py, int w, int h) +void drawImage(image_t * p, int x, int y, int px, int py, int w, int h) { - static SDL_Surface *screen = NULL; - SDL_Rect dst_rect, src_rect; + static SDL_Surface *screen = NULL; + SDL_Rect dst_rect, src_rect; - if (screen == NULL) { - screen = getSDL_Screen(); - } + if (screen == NULL) { + screen = getSDL_Screen(); + } - dst_rect.x = x; - dst_rect.y = y; + dst_rect.x = x; + dst_rect.y = y; - src_rect.x = px; - src_rect.y = py; - src_rect.w = w; - src_rect.h = h; + src_rect.x = px; + src_rect.y = py; + src_rect.w = w; + src_rect.h = h; - SDL_BlitSurface(p->image, &src_rect, screen, &dst_rect); + SDL_BlitSurface(p->image, &src_rect, screen, &dst_rect); } /* * Odstrani zoznam obrazkov z pamate */ -void -quitImageData() +void quitImageData() { #ifdef DEBUG - printf(_("Quitting image database\n")); + printf(_("Quitting image database\n")); #endif - destroyStorage(listStorage, destroyImage); - isImageDataInit = FALSE; + destroyStorage(listStorage, destroyImage); + isImageDataInit = FALSE; } |