diff -urN D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/chuukei.c D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/chuukei.c --- D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/chuukei.c Sun Sep 20 18:10:31 2009 +++ D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/chuukei.c Mon Sep 21 00:17:11 2009 @@ -7,6 +7,7 @@ #include #ifdef WINDOWS #include +#include #endif #ifdef CHUUKEI diff -urN D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/h-config.h D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/h-config.h --- D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/h-config.h Sun Sep 20 18:10:33 2009 +++ D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/h-config.h Sun Sep 20 23:01:00 2009 @@ -36,6 +36,7 @@ /* * Extract the "MAC_MPW" flag from the compiler */ +#ifndef __DMC__ #if defined(__SC__) || defined(__MRC__) # ifndef MACINTOSH # define MACINTOSH @@ -43,6 +44,7 @@ # ifndef MAC_MPW # define MAC_MPW # endif +#endif #endif diff -urN D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/init1.c D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/init1.c --- D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/init1.c Sun Sep 20 18:10:31 2009 +++ D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/init1.c Mon Sep 21 15:50:07 2009 @@ -1329,7 +1329,7 @@ /* Scan for the values */ - if (4 != sscanf(s, "%x:%d:%d:%d", + if (4 != sscanf(s, "%i:%d:%d:%d", (uint *)&xtra, &type, &first, &weight)) return (1); m_ptr->spell_xtra = xtra; @@ -3043,9 +3043,8 @@ int min_alloc, max_chance; int obj_good, obj_great; int pit, nest; - /* Scan for the values */ - if (10 != sscanf(buf+2, "%d:%d:%d:%d:%d:%d:%d:%d:%x:%x", + if (10 != sscanf(buf+2, "%d:%d:%d:%d:%d:%d:%d:%d:%i:%i", &min_lev, &max_lev, &min_plev, &mode, &min_alloc, &max_chance, &obj_good, &obj_great, (unsigned int *)&pit, (unsigned int *)&nest)) return (1); /* Save the values */ diff -urN D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/main-win.c D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/main-win.c --- D:\rlbuild\Hengband\hengband-trunk-rev3046-win\Hengband\src/main-win.c Sun Sep 20 18:10:32 2009 +++ D:\rlbuild\dmc\Hengband\hengband-trunk-rev3046-win\Hengband\src/main-win.c Sun Sep 20 23:49:27 2009 @@ -2915,7 +2915,7 @@ /* Ignore non-graphics */ if ((a & 0x80) && (c & 0x80)) { - Term_pict_win(x - min_x, y - min_y, 1, &a, &c, &ta, &tc); + Term_pict_win(x - min_x, y - min_y, 1, &a, (char*)&c, &ta, (char*)&tc); } } } @@ -2924,7 +2924,7 @@ Term_curs_win(px - min_x, py - min_y); /* Wait for a keypress, flush key buffer */ - Term_inkey(&c, TRUE, TRUE); + Term_inkey((char*)&c, TRUE, TRUE); Term_flush(); /* Switch off the map display */