Changeset 521

Show
Ignore:
Timestamp:
08/12/07 19:26:33 (1 year ago)
Author:
takkaria
Message:

Clean up config.h a bit, and remove the UPDATE_VIEW_COMPLEX_WALL_ILLUMINATION #define.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/cave.c

    r520 r521  
    29392939                                                        int xx = (x < px) ? (x + 1) : (x > px) ? (x - 1) : x; 
    29402940 
    2941 #ifdef UPDATE_VIEW_COMPLEX_WALL_ILLUMINATION 
    2942  
    2943                                                         /* Check for "complex" illumination */ 
    2944                                                         if ((!(cave_info[yy][xx] & (CAVE_WALL)) && 
    2945                                                               (cave_info[yy][xx] & (CAVE_GLOW))) || 
    2946                                                             (!(cave_info[y][xx] & (CAVE_WALL)) && 
    2947                                                               (cave_info[y][xx] & (CAVE_GLOW))) || 
    2948                                                             (!(cave_info[yy][x] & (CAVE_WALL)) && 
    2949                                                               (cave_info[yy][x] & (CAVE_GLOW)))) 
    2950                                                         { 
    2951                                                                 /* Mark as seen */ 
    2952                                                                 info |= (CAVE_SEEN); 
    2953                                                         } 
    2954  
    2955 #else /* UPDATE_VIEW_COMPLEX_WALL_ILLUMINATION */ 
    2956  
    29572941                                                        /* Check for "simple" illumination */ 
    29582942                                                        if (cave_info[yy][xx] & (CAVE_GLOW)) 
    …… 
    29612945                                                                info |= (CAVE_SEEN); 
    29622946                                                        } 
    2963  
    2964 #endif /* UPDATE_VIEW_COMPLEX_WALL_ILLUMINATION */ 
    2965  
    29662947                                                } 
    29672948 

  • trunk/src/config.h

    r520 r521  
    1 /* File: config.h */ 
    2  
    31#ifndef INCLUDED_CONFIG_H 
    42#define INCLUDED_CONFIG_H 
    53 
    6 /* 
    7  * Copyright (c) 1997 Ben Harrison, James E. Wilson, Robert A. Koeneke 
    8  * 
    9  * This software may be copied and distributed for educational, research, 
    10  * and not for profit purposes provided that this copyright and statement 
    11  * are included in all such copies.  Other copyrights may also apply. 
    12  */ 
    13  
     4/*** Some really important things you ought to change ***/ 
    145 
    156/* 
    16  * Look through the following lines, and where a comment includes the 
    17  * tag "OPTION:", examine the associated "#define" statements, and decide 
    18  * whether you wish to keep, comment, or uncomment them.  You should not 
    19  * have to modify any lines not indicated by "OPTION". 
    20  * 
    21  * Note: Also examine the "system" configuration file "h-basic.h". 
    22  * 
    23  * And finally, remember that the "Makefile" will specify some rather 
    24  * important compile time options, like what visual module to use. 
    25  */ 
    26  
    27  
    28 /* 
    29  * OPTION: See the Makefile(s), where several options may be declared. 
    30  * 
    31  * Some popular options include "USE_GCU" (allow use with Unix "curses"), 
    32  * "USE_X11" (allow basic use with Unix X11), "USE_XAW" (allow use with 
    33  * Unix X11 plus the Athena Widget set), and "USE_CAP" (allow use with 
    34  * the "termcap" library, or with hard-coded vt100 terminals). 
    35  * 
    36  * Several other such options are available for non-unix machines, 
    37  * such as "MACINTOSH", "WINDOWS", "USE_IBM", "USE_EMX". 
    38  */ 
    39  
    40  
    41  
    42 /* 
    43  * OPTION: Hack -- Compile in support for "Borg mode" 
    44  */ 
    45 /* #define ALLOW_BORG */ 
    46  
    47  
    48 /* 
    49  * OPTION: Hack -- Compile in support for "Debug Commands" 
    50  */ 
    51 #define ALLOW_DEBUG 
    52  
    53 /* 
    54  * OPTION: Hack -- Compile in support for "Spoiler Generation" 
    55  */ 
    56 #define ALLOW_SPOILERS 
    57  
    58 /* 
    59  * OPTION: Allow "do_cmd_colors" at run-time 
    60  */ 
    61 #define ALLOW_COLORS 
    62  
    63 /* 
    64  * OPTION: Allow "do_cmd_visuals" at run-time 
    65  */ 
    66 #define ALLOW_VISUALS 
    67  
    68 /* 
    69  * OPTION: Allow "do_cmd_macros" at run-time 
    70  */ 
    71 #define ALLOW_MACROS 
    72  
    73  
    74 /* 
    75  * OPTION: Allow parsing of the ascii template files in "init.c". 
    76  * This must be defined if you do not have valid binary image files. 
    77  * It should be usually be defined anyway to allow easy "updating". 
    78  */ 
    79 #define ALLOW_TEMPLATES 
    80  
    81  
    82 /* 
    83  * OPTION: Allow processing of template files once parsed. 
    84  * This 'evaluates' the contents of the files. It is is currently 
    85  * used for balancing the monster list (monster.txt). 
    86  */ 
    87  
    88 /* #define ALLOW_TEMPLATES_PROCESS */ 
    89  
    90  
    91 /* 
    92  * OPTION: Allow output of 'parsable' ascii template files. 
    93  * This can be used to help change the ascii template format, and to 
    94  * make changes to the data in the parsed files within Angband itself. 
    95  * 
    96  * Files are output to lib\user with the same file names as lib\edit. 
    97  */ 
    98  
    99 /* #define ALLOW_TEMPLATES_OUTPUT */ 
    100  
    101  
    102  
    103 /* 
    104  * OPTION: Allow "Borgs" to yield "high scores" 
    105  */ 
    106 /* #define SCORE_BORGS */ 
    107  
    108  
    109  
    110  
    111 /* 
    112  * OPTION: Use the "complex" wall illumination code 
    113  */ 
    114 /* #define UPDATE_VIEW_COMPLEX_WALL_ILLUMINATION */ 
    115  
    116  
    117 /* 
    118  * OPTION: Gamma correct colours (with X11) 
    119  */ 
    120 #define SUPPORT_GAMMA 
    121  
    122 /* 
    123  * OPTION: Allow the use of "sound" in various places. 
    124  */ 
    125 #define USE_SOUND 
    126  
    127 /* 
    128  * OPTION: Allow the use of "graphics" in various places 
    129  */ 
    130 #define USE_GRAPHICS 
    131  
    132  
    133  
    134  
    135 /* 
    136  * OPTION: Set the "default" path to the angband "lib" directory. 
    137  * 
    138  * See "main.c" for usage, and note that this value is only used on 
    139  * certain machines, primarily Unix machines. 
     7 * Defines the default path to the Angband "lib" directory, for ports that use 
     8 * the main.c file. 
    1409 * 
    14110 * The configure script overrides this value.  Check the "--prefix=<dir>" 
    …… 
    18049 
    18150 
     51/*** Some no-brainer defines ***/ 
     52 
     53/* Allow the game to make noises correlating to what the player does in-game */ 
     54#define USE_SOUND 
     55 
     56/* Allow the use of graphics rather than only having a text-mode */ 
     57#define USE_GRAPHICS 
     58 
     59/* Compile in support for debug commands */ 
     60#define ALLOW_DEBUG 
     61 
     62/* Compile in support for spoiler generation */ 
     63#define ALLOW_SPOILERS 
     64 
     65/* Allow changing colours at runtime */ 
     66#define ALLOW_COLORS 
     67 
     68/* Allow changing "visuals" at runtime */ 
     69#define ALLOW_VISUALS 
     70 
     71/* Allow chaning macros at run-time */ 
     72#define ALLOW_MACROS 
     73 
     74/* Allow parsing of the lib/edit/ files. */ 
     75#define ALLOW_TEMPLATES 
     76 
     77 
     78 
     79/*** Borg ***/ 
     80 
     81/* Compile in support for the borg. */ 
     82/* #define ALLOW_BORG */ 
     83 
     84/* Allow borgs to yield "high scores"? */ 
     85/* #define SCORE_BORGS */ 
     86 
     87 
     88/* 
     89 * Allow the Borg to use graphics. 
     90 */ 
     91#if defined(ALLOW_BORG) && defined(USE_GRAPHICS) 
     92# define ALLOW_BORG_GRAPHICS 
     93#endif 
     94 
     95 
     96 
     97/*** Things useful for debugging compiles ***/ 
     98 
     99/* 
     100 * OPTION: Allow processing of template files once parsed. 
     101 * This 'evaluates' the contents of the files. It is is currently used for 
     102 * balancing the monster list (monster.txt). 
     103 */ 
     104/* #define ALLOW_TEMPLATES_PROCESS */ 
     105 
     106 
     107/* 
     108 * OPTION: Allow output of 'parsable' ascii template files. 
     109 * This can be used to help change the ascii template format, and to make 
     110 * changes to the data in the parsed files within Angband itself. 
     111 * 
     112 * Files are output to lib/user with the same file names as lib/edit. 
     113 */ 
     114/* #define ALLOW_TEMPLATES_OUTPUT */ 
     115 
     116 
     117 
     118 
     119 
     120/*** X11 settings ***/ 
     121 
     122/* 
     123 * OPTION: Gamma correct colours (with X11) 
     124 */ 
     125#define SUPPORT_GAMMA 
     126 
     127 
    182128/* 
    183129 * OPTION: Default font (when using X11). 
    …… 
    199145 
    200146 
    201  
    202  
    203  
    204 /* 
    205  * HACK - define if the source contains the cleanup_angband() function. 
    206  */ 
    207 #define HAS_CLEANUP 
    208  
    209  
    210  
    211 /* 
    212  * Allow the Borg to use graphics. 
    213  */ 
    214 #ifdef ALLOW_BORG 
    215 # ifdef USE_GRAPHICS 
    216 #  define ALLOW_BORG_GRAPHICS 
    217 # endif /* USE_GRAPHICS */ 
    218 #endif /* ALLOW_BORG */ 
    219  
    220147#endif /* !INCLUDED_CONFIG_H */ 

  • trunk/src/main-gtk.c

    r315 r521  
    2020 
    2121#ifdef USE_GTK 
     22 
     23#define HAS_CLEANUP 
     24 
    2225 
    2326#include "main.h" 

  • trunk/src/main-win.c

    r487 r521  
    7676 
    7777#if (defined(WINDOWS) && !defined(USE_SDL)) 
     78 
     79 
     80#define HAS_CLEANUP 
    7881 
    7982