Changeset 1025

Show
Ignore:
Timestamp:
10/10/08 06:19:14 (1 month ago)
Author:
takkaria
Message:

Fix previous commit, which used $s instead of %s. Concatenate at compile-time rather than run time where possible.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/init2.c

    r1024 r1025  
    122122 
    123123        /* Build xtra/ paths */ 
    124         ANGBAND_DIR_XTRA_FONT = string_make(format("%s%sfont", ANGBAND_DIR_XTRA, PATH_SEP)); 
    125         ANGBAND_DIR_XTRA_GRAF = string_make(format("%s$sgraf", ANGBAND_DIR_XTRA, PATH_SEP)); 
    126         ANGBAND_DIR_XTRA_SOUND = string_make(format("%s%ssound", ANGBAND_DIR_XTRA, PATH_SEP)); 
    127         ANGBAND_DIR_XTRA_HELP = string_make(format("%s%shelp", ANGBAND_DIR_XTRA, PATH_SEP)); 
    128         ANGBAND_DIR_XTRA_ICON = string_make(format("%s%sicon", ANGBAND_DIR_XTRA, PATH_SEP)); 
    129          
     124        ANGBAND_DIR_XTRA_FONT = string_make(format("%s" PATH_SEP "font", ANGBAND_DIR_XTRA)); 
     125        ANGBAND_DIR_XTRA_GRAF = string_make(format("%s" PATH_SEP "graf", ANGBAND_DIR_XTRA)); 
     126        ANGBAND_DIR_XTRA_SOUND = string_make(format("%s" PATH_SEP "sound", ANGBAND_DIR_XTRA)); 
     127        ANGBAND_DIR_XTRA_HELP = string_make(format("%s" PATH_SEP "help", ANGBAND_DIR_XTRA)); 
     128        ANGBAND_DIR_XTRA_ICON = string_make(format("%s" PATH_SEP "icon", ANGBAND_DIR_XTRA)); 
     129 
    130130#ifdef PRIVATE_USER_PATH 
    131131