Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 |
diff --git a/apps/plugins/doom/am_map.c b/apps/plugins/doom/am_map.c index eb4e132..349e69e 100644 int ddt_cheating = 0; // killough 2/7/98: make global, rename to ddt_* static int leveljuststarted = 1; // kluge until AM_LevelInit() is called -enum automapmode_e automapmode; // Mode that the automap is in +int automapmode; // Mode that the automap is in // location of window on screen static int f_x; diff --git a/apps/plugins/doom/d_main.h b/apps/plugins/doom/d_main.h index 3700c48..40bfa94 100644 extern boolean clrespawnparm; // checkparm of -respawn extern boolean clfastparm; // checkparm of -fast //jff end of external declaration of command line playmode -extern boolean enable_sound; +extern int enable_sound; extern boolean nomusicparm; extern int ffmap; diff --git a/apps/plugins/doom/doomdef.c b/apps/plugins/doom/doomdef.c index 3facfbb..6ae4bb6 100644 // Location for any defines turned variables. #if(LCD_HEIGHT>LCD_WIDTH) -bool rotate_screen=0; +int rotate_screen=0; int SCREENWIDTH; int SCREENHEIGHT; #endif diff --git a/apps/plugins/doom/doomdef.h b/apps/plugins/doom/doomdef.h index a0e8ad5..b6ac1d4 100644 typedef enum { // when multiple screen sizes are supported #if(LCD_HEIGHT>LCD_WIDTH) -extern bool rotate_screen; +extern int rotate_screen; // proff 08/17/98: Changed for high-res #define MAX_SCREENWIDTH LCD_HEIGHT #define MAX_SCREENHEIGHT LCD_HEIGHT diff --git a/apps/plugins/doom/doomstat.c b/apps/plugins/doom/doomstat.c index b6dc649..cc8b7a7 100644 boolean modifiedgame; //----------------------------------------------------------------------------- -// CPhipps - compatibility vars -complevel_t compatibility_level=prboom_3_compatibility, default_compatibility_level=prboom_3_compatibility; +// CPhipps - compatibility vars - +// was complevel_t but it's accessed via int* so it needs to be int +unsigned int compatibility_level=prboom_3_compatibility, default_compatibility_level=prboom_3_compatibility; int comp[COMP_TOTAL] IBSS_ATTR, default_comp[COMP_TOTAL]; // killough 10/98 int doom_weapon_toggles; // killough 10/98 int monkeys IBSS_ATTR, default_monkeys; -boolean enable_sound=1; +int enable_sound=1; boolean rockblock=1; diff --git a/apps/plugins/doom/doomstat.h b/apps/plugins/doom/doomstat.h index 5a5a87c..ffe7c7a 100644 enum automapmode_e { am_follow = 8, // keep the player centred am_grid =16, // show grid }; -extern enum automapmode_e automapmode; // Mode that the automap is in +/* not enum automapmode_e since it's accessed via int* */ +extern int automapmode; // Mode that the automap is in // ----------------------------------------------------- // Game Mode - identify IWAD as shareware, retail etc. extern GameMission_t gamemission; extern boolean modifiedgame; // CPhipps - new compatibility handling -extern complevel_t compatibility_level, default_compatibility_level; +extern unsigned int compatibility_level, default_compatibility_level; // CPhipps - old compatibility testing flags aliased to new handling #define compatibility (compatibility_level<=boom_compatibility_compatibility) enum { extern int comp[COMP_TOTAL], default_comp[COMP_TOTAL]; -extern boolean enable_sound; +extern int enable_sound; extern boolean rockblock; // ------------------------------------------- extern char basedefault[]; extern int debugfile; // if true, load all graphics at level load -extern boolean precache; +extern int precache; // wipegamestate can be set to -1 diff --git a/apps/plugins/doom/m_misc.c b/apps/plugins/doom/m_misc.c index 1e4b75d..ee0f464 100644 int M_ReadFile(char const* name,byte** buffer) // int usemouse; -boolean precache = true; /* if true, load all graphics at start */ +int precache = true; /* if true, load all graphics at start */ extern int mousebfire; extern int mousebstrafe; int map_point_coordinates; default_t defaults[] = { {"Misc settings",{NULL, NULL},{0, NULL},UL,UL,def_none,ss_none, 0, 0}, - {"default_compatibility_level",{(void *)&default_compatibility_level, NULL}, + {"default_compatibility_level",{&default_compatibility_level, NULL}, {-1, NULL},-1,MAX_COMPATIBILITY_LEVEL-1, def_int,ss_none, 0, 0}, // compatibility level" - CPhipps // {"realtic_clock_rate",{&realtic_clock_rate, NULL},{100, NULL},0,UL, default_t defaults[] = def_int,ss_none, 0, 0}, // 1=take special steps ensuring demo sync, 2=only during recordings // {"endoom_mode", {&endoom_mode, NULL},{5, NULL},0,7, // CPhipps - endoom flags // def_hex, ss_none, 0, 0}, // 0, +1 for colours, +2 for non-ascii chars, +4 for skip-last-line - {"level_precache",{(void*)&precache, NULL},{1, NULL},0,1, + {"level_precache",{&precache, NULL},{1, NULL},0,1, def_bool,ss_none, 0, 0}, // precache level data? {"Files",{NULL, NULL},{0, NULL},UL,UL,def_none,ss_none, 0, 0}, default_t defaults[] = {"pitched_sounds",{&pitched_sounds, NULL},{0, NULL},0,1, // killough 2/21/98 def_bool,ss_none, 0, 0}, // enables variable pitch in sound effects (from id's original code) // {"samplerate",{&snd_samplerate, NULL},{22050, NULL},11025,48000, def_int,ss_none, 0, 0}, - {"enable_sound",{(void *)&enable_sound, NULL},{0, NULL},0,1, def_bool,ss_none, 0, 0}, + {"enable_sound",{&enable_sound, NULL},{0, NULL},0,1, def_bool,ss_none, 0, 0}, {"sfx_volume",{&snd_SfxVolume, NULL},{8, NULL},0,15, def_int,ss_none, 0, 0}, {"music_volume",{&snd_MusicVolume, NULL},{8, NULL},0,15, def_int,ss_none, 0, 0}, {"mus_pause_opt",{&mus_pause_opt, NULL},{2, NULL},0,2, // CPhipps - music pausing default_t defaults[] = {"screen_height",{&desired_screenheight, NULL},{200, NULL},200,1200, def_int,ss_none, 0, 0},*/ #if(LCD_HEIGHT>LCD_WIDTH) - {"rotate_screen",{(void *)&rotate_screen, NULL},{0, NULL},0,1, + {"rotate_screen",{&rotate_screen, NULL},{0, NULL},0,1, def_bool,ss_none, 0, 0}, /* kwk - rotate the screen 90 degrees */ #endif {"fake_contrast",{&fake_contrast, NULL},{1, NULL},0,1, default_t defaults[] = {"map_point_coord", {&map_point_coordinates, NULL}, {0, NULL},0,1, def_bool,ss_auto, 0, 0}, //jff 1/7/98 end additions for automap - {"automapmode", {(void*)&automapmode, NULL}, {0, NULL}, 0, 31, // CPhipps - remember automap mode + {"automapmode", {&automapmode, NULL}, {0, NULL}, 0, 31, // CPhipps - remember automap mode def_hex,ss_none, 0, 0}, // automap mode {"Heads-up display settings",{NULL, NULL},{0, NULL},UL,UL,def_none,ss_none, 0, 0}, |
