X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=5f5419f200243dda3b78212720f1c2ea342b82cc;hb=4f767d54c7ac468e9a42e22caf716111be1ceba9;hp=8e60cfeb3a94b6778d5fa9bc79b922ce8eceb57e;hpb=49dab46aa55cb43233c7f9a310593f8bd8debc29;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 8e60cfeb..5f5419f2 100644 --- a/src/init.c +++ b/src/init.c @@ -20,17 +20,10 @@ #include "tools.h" #include "files.h" #include "joystick.h" -#include "gfxload.h" -#include "gifload.h" +#include "image.h" #include "network.h" #include "netserv.h" -#ifdef DEBUG -/* -#define DEBUG_TIMING -*/ -#endif - struct PictureFileInfo { char *picture_filename; @@ -105,9 +98,7 @@ void InitLevelAndPlayerInfo() local_player->connected = TRUE; - if (!LoadLevelInfo()) /* global level info */ - Error(ERR_EXIT, NULL); - + LoadLevelInfo(); /* global level info */ LoadSetup(); /* global setup info */ LoadLevelSetup(); /* info about last played level */ } @@ -124,7 +115,7 @@ void InitNetworkServer() if (!ConnectToServer(options.server_host, options.server_port)) Error(ERR_EXIT, "cannot connect to multiplayer server"); - SendToServer_Nickname(setup.alias_name); + SendToServer_Nickname(setup.player_name); SendToServer_ProtocolVersion(); if (nr_wanted) @@ -327,6 +318,7 @@ void InitWindow(int argc, char *argv[]) int win_xpos = WIN_XPOS, win_ypos = WIN_YPOS; unsigned long pen_fg = WhitePixel(display,screen); unsigned long pen_bg = BlackPixel(display,screen); + const int width = WIN_XSIZE, height = WIN_YSIZE; #ifndef MSDOS static struct IconFileInfo icon_pic = @@ -339,9 +331,6 @@ void InitWindow(int argc, char *argv[]) screen_width = XDisplayWidth(display, screen); screen_height = XDisplayHeight(display, screen); - width = WIN_XSIZE; - height = WIN_YSIZE; - win_xpos = (screen_width - width) / 2; win_ypos = (screen_height - height) / 2; @@ -503,9 +492,8 @@ void InitGfx() { -1, 0 } }; -#ifdef DEBUG_TIMING - long count1, count2; - count1 = Counter(); +#if DEBUG_TIMING + debug_print_timestamp(0, NULL); /* initialize timestamp function */ #endif LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]); @@ -521,12 +509,10 @@ void InitGfx() if (i != PIX_SMALLFONT) LoadGfx(i,&pic[i]); -#ifdef DEBUG_TIMING - count2 = Counter(); - printf("SUMMARY: %.2f SECONDS LOADING TIME\n",(float)(count2-count1)/1000.0); +#if DEBUG_TIMING + debug_print_timestamp(0, "SUMMARY LOADING ALL GRAPHICS:"); #endif - pix[PIX_DB_BACK] = XCreatePixmap(display, window, WIN_XSIZE,WIN_YSIZE, XDefaultDepth(display,screen)); @@ -633,7 +619,7 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) char basefilename[256]; char filename[256]; -#ifdef XPM_INCLUDE_FILE +#ifdef USE_XPM_LIBRARY int xpm_err, xbm_err; unsigned int width,height; int hot_x,hot_y; @@ -641,12 +627,8 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) char *picture_ext = ".xpm"; char *picturemask_ext = "Mask.xbm"; #else - int gif_err; - char *picture_ext = ".gif"; -#endif - -#ifdef DEBUG_TIMING - long count1, count2; + int pcx_err; + char *picture_ext = ".pcx"; #endif /* Grafik laden */ @@ -661,17 +643,16 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) rest(100); #endif MSDOS -#ifdef DEBUG_TIMING - count1 = Counter(); +#if DEBUG_TIMING + debug_print_timestamp(1, NULL); /* initialize timestamp function */ #endif -#ifdef XPM_INCLUDE_FILE +#ifdef USE_XPM_LIBRARY xpm_att[pos].valuemask = XpmCloseness; xpm_att[pos].closeness = 20000; xpm_err = XpmReadFileToPixmap(display,window,filename, &pix[pos],&shapemask,&xpm_att[pos]); - switch(xpm_err) { case XpmOpenFailed: @@ -686,42 +667,39 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) break; } -#ifdef DEBUG_TIMING - count2 = Counter(); - printf("XPM LOADING %s IN %.2f SECONDS\n", - filename,(float)(count2-count1)/1000.0); +#if DEBUG_TIMING + printf("LOADING XPM FILE %s:", filename); + debug_print_timestamp(1, ""); #endif -#else +#else /* !USE_XPM_LIBRARY */ - gif_err = Read_GIF_to_Pixmaps(display, window, filename, + pcx_err = Read_PCX_to_Pixmaps(display, window, gc, filename, &pix[pos], &clipmask[pos]); - - switch(gif_err) + switch(pcx_err) { - case GIF_Success: + case PCX_Success: break; - case GIF_OpenFailed: - Error(ERR_EXIT, "cannot open GIF file '%s'", filename); - case GIF_ReadFailed: - Error(ERR_EXIT, "cannot read GIF file '%s'", filename); - case GIF_FileInvalid: - Error(ERR_EXIT, "invalid GIF file '%s'", filename); - case GIF_NoMemory: - Error(ERR_EXIT, "not enough memory for GIF file '%s'", filename); - case GIF_ColorFailed: - Error(ERR_EXIT, "cannot get colors for GIF file '%s'", filename); + case PCX_OpenFailed: + Error(ERR_EXIT, "cannot open PCX file '%s'", filename); + case PCX_ReadFailed: + Error(ERR_EXIT, "cannot read PCX file '%s'", filename); + case PCX_FileInvalid: + Error(ERR_EXIT, "invalid PCX file '%s'", filename); + case PCX_NoMemory: + Error(ERR_EXIT, "not enough memory for PCX file '%s'", filename); + case PCX_ColorFailed: + Error(ERR_EXIT, "cannot get colors for PCX file '%s'", filename); default: break; } -#ifdef DEBUG_TIMING - count2 = Counter(); - printf("GIF LOADING %s IN %.2f SECONDS\n", - filename,(float)(count2-count1)/1000.0); +#if DEBUG_TIMING + printf("SUMMARY LOADING PCX FILE %s:", filename); + debug_print_timestamp(1, ""); #endif -#endif +#endif /* !USE_XPM_LIBRARY */ if (!pix[pos]) Error(ERR_EXIT, "cannot get graphics for '%s'", pic->picture_filename); @@ -730,21 +708,19 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) /* zugehörige Maske laden (wenn vorhanden) */ if (pic->picture_with_mask) { - -#ifdef XPM_INCLUDE_FILE +#ifdef USE_XPM_LIBRARY sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext); DrawInitText(basefilename, 150, FC_YELLOW); sprintf(filename, "%s/%s/%s", options.base_directory, GRAPHICS_DIRECTORY, basefilename); -#ifdef DEBUG_TIMING - count1 = Counter(); +#if DEBUG_TIMING + debug_print_timestamp(1, NULL); /* initialize timestamp function */ #endif xbm_err = XReadBitmapFile(display,window,filename, &width,&height,&clipmask[pos],&hot_x,&hot_y); - switch(xbm_err) { case BitmapSuccess: @@ -760,13 +736,12 @@ void LoadGfx(int pos, struct PictureFileInfo *pic) break; } -#ifdef DEBUG_TIMING - count2 = Counter(); - printf("XBM LOADING %s IN %.2f SECONDS\n", - filename,(float)(count2-count1)/1000.0); +#if DEBUG_TIMING + printf("LOADING XBM FILE %s:", filename); + debug_print_timestamp(1, ""); #endif -#endif +#endif /* USE_XPM_LIBRARY */ if (!clipmask[pos]) Error(ERR_EXIT, "cannot get clipmask for '%s'", pic->picture_filename); @@ -1342,8 +1317,8 @@ void CloseAllAndExit(int exit_value) { if (pix[i]) { -#ifdef XPM_INCLUDE_FILE - if (i