New alpha

Author: draconisPW

.gitignore

@@ -2,7 +2,7 @@ mangband.cfg
 mangband.drc
 *.exe
 mangband.map
-mangband.tds
+*.tds
 mangclient.ini
 Roadmap.txt
 /debug

changes.txt

@@ -20,6 +20,7 @@ Angband 4.2.x:
 - Allow fuel to be drawn from the quiver
 - Display average damage for devices, spells, and activations
 - Allow CMD_WIELD to select from the quiver
+- Take into account sidebar/topbar in double-height tile rendering
 
 MAngband 1.5.x:
 
@@ -34,6 +35,8 @@ MAngband 1.5.x:
 - Add Ctrl+E toggle_inven_equip command from V
 - Add some shared monster messages
 - Hitpoint warning toggle hotkey
+- Use font-tng.prf instead of font-sdl.prf for "tg" fonts
+- Change visual mapping for PvP arena wall
 
 PWMAngband:
 
@@ -237,6 +240,8 @@ MAngband 1.5.x:
 - Stop resending whole equipment/inventory when a single item is affected
 - Add most of the missing bell() calls
 - Fix ESC key not clearing the queue
+- Add error condition check to file_putf
+- Don't use handle_stuff() in adjust_level()
 
 PWMAngband:
 

lib/customize/Makefile

@@ -3,6 +3,7 @@ include $(MKPATH)buildsys.mk
 
 CONFIG = \
        font-gcu.prf font-sdl.prf font-win.prf font-x11.prf font.prf \
+       font-tng.prf \
        keys-gcu.prf message.prf pref.prf user.prf sound.prf \
        class.prf presets.prf race.prf
 

lib/customize/font-tng.prf

@@ -0,0 +1,34 @@
+# File: font-tng.prf
+
+#
+# Tangar 1-bit roguelike font mapping.
+#
+# Note that this file is a pure copy of the font-sdl.prf file by default and
+# doesn't include any mapping. These have to be added manually.
+#
+
+
+### Terrain features ###
+
+# Floors (white : centered dot)
+#feat:open floor:*:1:7
+feat:open floor:*:7:7
+
+# Simplified version to specify default attribute for all lighting effects
+# glyph : terrain name : symbol
+# glyph:open floor:7
+
+
+### Monster features ###
+
+# Regular version to bypass default value from monster.txt
+# monster : name : attr : char
+# monster:Uvatha the Horseman:1:205
+#
+# Simplified version to specify default attribute (client only)
+# monster-char : name : char
+# monster-char:Uvatha the Horseman:205
+#
+# Alternate version to specify attr by symbol (client only)
+# monster-attr : name : attr : char
+# monster-attr:Uvatha the Horseman:w:205

lib/customize/font.prf

@@ -18,4 +18,7 @@
 ?:[EQU $SYS gcu]
 %:font-gcu.prf
 
+?:[IOR [EQU $FONTNAME 21x31tg.fon] [EQU $FONTNAME 24x36tg.fon]]
+%:font-tng.prf
+
 ?:1

lib/tiles/gervais/32x32.png

@@ -281,10 +281,10 @@ feat:house wall:los:0x99:0x81
 feat:house wall:lit:0x99:0x82
 feat:house wall:dark:0x99:0x82
 
-feat:arena wall:torch:0x99:0x80
-feat:arena wall:los:0x99:0x81
-feat:arena wall:lit:0x99:0x82
-feat:arena wall:dark:0x99:0x82
+feat:arena wall:torch:0x98:0xF5
+feat:arena wall:los:0x98:0xF6
+feat:arena wall:lit:0x98:0xF7
+feat:arena wall:dark:0x98:0xF7
 
 # water
 feat:water:torch:0x97:0x92

lib/tiles/gervais/graf-dvg.prf

@@ -407,7 +407,7 @@ static errr sdl_FontCreate(sdl_Font *font, const char *fontname, SDL_Surface *su
 /*
  * Draw some text onto a surface, allowing shaded backgrounds.
  * The surface is first checked to see if it is compatible with
- * this font, if it isn't the the font will be 're-precalculated'.
+ * this font, if it isn't then the font will be 're-precalculated'.
  *
  * You can, I suppose, use one font on many surfaces, but it is
  * definitely not recommended. One font per surface is good enough.
@@ -448,7 +448,7 @@ static errr sdl_mapFontDraw(sdl_Font *font, SDL_Surface *surface, SDL_Color colo
 /*
  * Draw some text onto a surface
  * The surface is first checked to see if it is compatible with
- * this font, if it isn't the the font will be 're-precalculated'
+ * this font, if it isn't then the font will be 're-precalculated'
  *
  * You can, I suppose, use one font on many surfaces, but it is
  * definitely not recommended. One font per surface is good enough.
@@ -2906,7 +2906,7 @@ static errr Term_bigcurs_sdl(int col, int row)
 
     /* If we are using overdraw, draw a double height cursor (disabled for now) */
     /*if (!Term_info(col, row, &a, &c, &ta, &tc)) j = (a & 0x7F);
-    if (overdraw && (j > 2) && (j >= overdraw) && (j <= overdraw_max))
+    if (overdraw && (j > ROW_MAP + 1) && (j >= overdraw) && (j <= overdraw_max))
     {
         rc.y -= rc.h;
         rc.h = (rc.h << 1);
@@ -3184,7 +3184,7 @@ static void sdl_DrawTile(term_window *win, int col, int row, SDL_Rect rc, SDL_Re
     }
 
     /* If we are using overdraw, draw the top rectangle */
-    if (overdraw && (row > 2) && (j >= overdraw) && (j <= overdraw_max))
+    if (overdraw && (row > ROW_MAP + 1) && (j >= overdraw) && (j <= overdraw_max))
     {
         /* Double the height */
         src.y -= rc.h;
@@ -3325,7 +3325,7 @@ static errr Term_text_sdl(int col, int row, int n, u16b a, const char *s)
             tilex = COL_MAP + ((col - COL_MAP + i) / tile_wid) * tile_wid;
             tiley = ROW_MAP + ((row - ROW_MAP) / tile_hgt + j) * tile_hgt;
 
-            if (overdraw && (tiley > 2) && !Term_info(tilex, tiley, &fa, &fc, &ta, &tc))
+            if (overdraw && (tiley > ROW_MAP + 1) && !Term_info(tilex, tiley, &fa, &fc, &ta, &tc))
             {
                 int row = (fa & 0x7F);
                 int trow = (ta & 0x7F);
@@ -3440,7 +3440,7 @@ static errr Term_pict_sdl(int col, int row, int n, const u16b *ap, const char *c
         /* Redraw the bottom tile (recursively) */
         while (j)
         {
-            if (overdraw && (row + j * tile_hgt > 2) &&
+            if (overdraw && (row + j * tile_hgt > ROW_MAP + 1) &&
                 !Term_info(col + i * tile_wid, row + j * tile_hgt, &a, &c, &ta, &tc))
             {
                 int frow = (a & 0x7F);
@@ -3743,6 +3743,9 @@ static void init_windows(void)
 
         /* Term 0 is at the top */
         Zorder[i] = ANGBAND_TERM_MAX - i - 1;
+
+        /* Hack -- set ANGBAND_FONTNAME for main window */
+        if (i == 0) ANGBAND_FONTNAME = win->req_font;
     }
 
     /* Good to go... */

src/client/main-sdl.c

@@ -1641,7 +1641,7 @@ static errr Term_bigcurs_win(int x, int y)
         int j = 0;
 
         if (!Term_info(x, y, &a, &c, &ta, &tc)) j = (a & 0x7F);
-        if ((j > 2) && (j >= overdraw) && (j <= overdrawmax))
+        if ((j > ROW_MAP + 1) && (j >= overdraw) && (j <= overdrawmax))
         {
             rc.top -= tile_height * tile_hgt;
             rc.bottom = rc.top + ((tile_height * tile_hgt) << 1);
@@ -1973,14 +1973,14 @@ static void Term_pict_win_aux(int x, int y, int n, const u16b *ap, const char *c
                 StretchBlt(hdc, x2, y2, tw2, th2, hdcSrc, x3, y3, w1, h1, SRCCOPY);
             }
 
-            if (overdraw && (trow >= overdraw) && (y > 2) && (trow <= overdrawmax))
+            if (overdraw && (trow >= overdraw) && (y > ROW_MAP + 1) && (trow <= overdrawmax))
                 AlphaBlend(hdc, x2, y2 - th2, tw2, th2, hdcSrc, x3, y3 - h1, w1, h1, blendfn);
 
             /* Only draw if terrain and overlay are different */
             if ((x1 != x3) || (y1 != y3))
             {
                 /* Copy the picture from the bitmap to the window */
-                if (overdraw && (row >= overdraw) && (y > 2) && (row <= overdrawmax))
+                if (overdraw && (row >= overdraw) && (y > ROW_MAP + 1) && (row <= overdrawmax))
                 {
                     AlphaBlend(hdc, x2, y2 - th2, tw2, th2 * 2, hdcSrc, x1, y1 - h1, w1, h1 * 2,
                         blendfn);
@@ -2064,7 +2064,7 @@ static errr Term_text_win(int x, int y, int n, u16b a, const char *s)
             tilex = COL_MAP + ((x - COL_MAP + i) / tile_wid) * tile_wid;
             tiley = ROW_MAP + ((y - ROW_MAP) / tile_hgt + j) * tile_hgt;
 
-            if (overdraw && (tiley > 2) && !Term_info(tilex, tiley, &fa, &fc, &ta, &tc))
+            if (overdraw && (tiley > ROW_MAP + 1) && !Term_info(tilex, tiley, &fa, &fc, &ta, &tc))
             {
                 int row = (fa & 0x7F);
                 int trow = (ta & 0x7F);
@@ -2147,7 +2147,7 @@ static errr Term_pict_win(int x, int y, int n, const u16b *ap, const char *cp, c
 
         while (j)
         {
-            if (overdraw && (y + j * tile_hgt > 2) &&
+            if (overdraw && (y + j * tile_hgt > ROW_MAP + 1) &&
                 !Term_info(x + i * tile_wid, y + j * tile_hgt, &a, &c, &ta, &tc))
             {
                 int row = (a & 0x7F);

src/client/main-win.c

@@ -475,6 +475,9 @@ static const char *process_pref_file_expr(char **sp, char *fp)
             /* System */
             if (streq(b+1, "SYS")) v = ANGBAND_SYS;
 
+            /* Specific font */
+            else if (streq(b+1, "FONTNAME")) v = ANGBAND_FONTNAME;
+
             /* Race */
             else if (streq(b+1, "RACE")) v = player->race->name;
 

src/client/ui-prefs.c

@@ -750,10 +750,20 @@ bool file_vputf(ang_file *f, const char *fmt, va_list vp)
 #else
     char buf[MSG_LEN];
 #endif
+    int n;
 
     if (!f) return false;
 
-    vstrnfmt(buf, sizeof(buf), fmt, vp);
+    n = vstrnfmt(buf, sizeof(buf), fmt, vp);
+
+    /*
+     * The semantics of vstrnfmt are weird and its return
+     * value is ill-defined. However, return value of zero
+     * almost definitely means there was an error (unless you pass it
+     * an empty format string with zero varargs, I guess).
+     */
+    if (n == 0) return false;
+
     return file_put(f, buf);
 }
 

src/common/z-file.c

@@ -28,6 +28,13 @@
 const char *ANGBAND_SYS = "xxx";
 
 
+/*
+ * Hack -- the font used
+ * This variable is used to choose an appropriate "pref-xxx" file
+ */
+const char *ANGBAND_FONTNAME = "xxx";
+
+
 /*
  * Various directories. These are no longer necessarily all subdirs of "lib"
  */

src/common/z-type.c

@@ -308,6 +308,7 @@ struct angband_constants
 extern struct angband_constants *z_info;
 
 extern const char *ANGBAND_SYS;
+extern const char *ANGBAND_FONTNAME;
 
 extern char *ANGBAND_DIR_GAMEDATA;
 extern char *ANGBAND_DIR_CUSTOMIZE;

src/common/z-type.h

@@ -155,8 +155,8 @@ static void adjust_level(struct player *p)
     /* Redraw experience */
     p->upkeep->redraw |= (PR_EXP);
 
-    /* Handle stuff */
-    handle_stuff(p);
+    /* Update stuff */
+    update_stuff(p, chunk_get(&p->wpos));
 
     /* Lose levels while possible */
     while ((p->lev > 1) && (p->exp < adv_exp(p->lev - 1, p->expfact)))
@@ -233,8 +233,8 @@ static void adjust_level(struct player *p)
         set_redraw_equip(p, NULL);
     }
 
-    /* Handle stuff */
-    handle_stuff(p);
+    /* Update stuff */
+    update_stuff(p, chunk_get(&p->wpos));
 }