nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Amiga: header hygiene and palette-size constants

Browse Source 
Add AMII_PALETTE_SIZE / AMIV_PALETTE_SIZE in amiconf.h to make the
actual populated portion of the init-map arrays explicit.  Drop the
redundant extern void exit() declaration.  Annotate Abort with
NORETURN in both amiconf.h and winproto.h; drop the duplicate Abort
declaration further down winproto.h.

Convert the bare-token "CLIPPING must be defined" assertion in
windefs.h into a real #error directive.

Comment in winext.h to disambiguate the three similarly named
amii*_init*map palette arrays.
This commit is contained in:
Ingo Paschke
2026-05-12 15:21:23 +02:00
parent ebcf31a4da
commit d99eeb17c2
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/amiga/winext.h
+11
View File
@@ -23,6 +23,17 @@ extern struct amii_DisplayDesc
*amiIDisplay; /* the Amiga Intuition descriptor */
extern struct window_procs amii_procs;
extern struct window_procs amiv_procs;
/* Three similarly-named palette arrays. Note the position of the
* second underscore distinguishes them:
* amii_initmap = working/runtime palette (mutated by tile/tomb load
* and the in-game color editor).
* amii_init_map = AMII (text-mode) compile-time defaults, 8 entries.
* amiv_init_map = AMIV (tile-mode) compile-time defaults, 32 entries
* (mutated by ReadImageFile when a tile/tomb IFF
* carries its own CMAP).
* The naming is historical; sysflags.amii_curmap is yet another related
* array holding the user's saved color choices.
*/
extern unsigned short amii_initmap[AMII_MAXCOLORS];
extern unsigned short amiv_init_map[AMII_MAXCOLORS];
extern unsigned short amii_init_map[AMII_MAXCOLORS];