Changeset 388

Show
Ignore:
Timestamp:
07/27/07 19:33:31 (1 year ago)
Author:
takkaria
Message:

Fix main-win.c warnings and errors.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main-win.c

    r275 r388  
    374374        bool bizarre; 
    375375 
    376         cptr font_want; 
    377  
    378         cptr font_file; 
     376        char *font_want; 
     377        char *font_file; 
    379378 
    380379        HFONT font_id; 
    …… 
    505504 * An array of sound file names 
    506505 */ 
    507 static cptr sound_file[MSG_MAX][SAMPLE_MAX]; 
     506static char *sound_file[MSG_MAX][SAMPLE_MAX]; 
    508507 
    509508#endif /* USE_SOUND */ 
    …… 
    513512 * Full path to ANGBAND.INI 
    514513 */ 
    515 static cptr ini_file = NULL; 
     514static char *ini_file = NULL; 
    516515 
    517516/* 
    …… 
    528527 * Directory names 
    529528 */ 
    530 static cptr ANGBAND_DIR_XTRA_FONT; 
    531 static cptr ANGBAND_DIR_XTRA_GRAF; 
    532 static cptr ANGBAND_DIR_XTRA_SOUND; 
    533 static cptr ANGBAND_DIR_XTRA_HELP; 
     529static char *ANGBAND_DIR_XTRA_FONT; 
     530static char *ANGBAND_DIR_XTRA_GRAF; 
     531static char *ANGBAND_DIR_XTRA_SOUND; 
     532static char *ANGBAND_DIR_XTRA_HELP; 
    534533 
    535534/* 
    …… 
    11801179        if (hBmPal) 
    11811180        { 
    1182                 lppe = ralloc(256 * sizeof(PALETTEENTRY)); 
     1181                lppe = mem_alloc(256 * sizeof(PALETTEENTRY)); 
    11831182                nEntries = GetPaletteEntries(hBmPal, 0, 255, lppe); 
    11841183                if ((nEntries == 0) || (nEntries > 220))