| Revision | 4a4f78a0fef498ee1f198821e3013ec3db579413 (tree) |
|---|---|
| Zeit | 2017-12-12 01:20:25 |
| Autor | Deskull <desull@user...> |
| Commiter | Deskull |
src/main-win.c (diff) src/racial.c (diff) src/spells3.c (diff)
src/types.h (diff) src/util.c (diff)| @@ -374,8 +374,8 @@ struct _term_data | ||
| 374 | 374 | |
| 375 | 375 | uint keys; |
| 376 | 376 | |
| 377 | - uint rows; /* int -> uint */ | |
| 378 | - uint cols; | |
| 377 | + TERM_POSITION rows; /* int -> uint */ | |
| 378 | + TERM_POSITION cols; | |
| 379 | 379 | |
| 380 | 380 | uint pos_x; |
| 381 | 381 | uint pos_y; |
| @@ -400,11 +400,11 @@ struct _term_data | ||
| 400 | 400 | |
| 401 | 401 | HFONT font_id; |
| 402 | 402 | |
| 403 | - uint font_wid; | |
| 404 | - uint font_hgt; | |
| 403 | + int font_wid; | |
| 404 | + int font_hgt; | |
| 405 | 405 | |
| 406 | - uint tile_wid; | |
| 407 | - uint tile_hgt; | |
| 406 | + int tile_wid; | |
| 407 | + int tile_hgt; | |
| 408 | 408 | |
| 409 | 409 | uint map_tile_wid; |
| 410 | 410 | uint map_tile_hgt; |
| @@ -605,8 +605,8 @@ static bool Term_no_press = FALSE; | ||
| 605 | 605 | */ |
| 606 | 606 | static bool mouse_down = FALSE; |
| 607 | 607 | static bool paint_rect = FALSE; |
| 608 | -static int mousex = 0, mousey = 0; | |
| 609 | -static int oldx, oldy; | |
| 608 | +static TERM_POSITION mousex = 0, mousey = 0; | |
| 609 | +static TERM_POSITION oldx, oldy; | |
| 610 | 610 | |
| 611 | 611 | |
| 612 | 612 | /* |
| @@ -2314,7 +2314,7 @@ static errr Term_xtra_win_react(void) | ||
| 2314 | 2314 | term_data *td = &data[i]; |
| 2315 | 2315 | |
| 2316 | 2316 | /* Update resized windows */ |
| 2317 | - if ((td->cols != (uint)td->t.wid) || (td->rows != (uint)td->t.hgt)) | |
| 2317 | + if ((td->cols != td->t.wid) || (td->rows != td->t.hgt)) | |
| 2318 | 2318 | { |
| 2319 | 2319 | /* Activate */ |
| 2320 | 2320 | Term_activate(&td->t); |
| @@ -4739,10 +4739,10 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, | ||
| 4739 | 4739 | HGLOBAL hGlobal; |
| 4740 | 4740 | LPSTR lpStr; |
| 4741 | 4741 | int j, sz; |
| 4742 | - int dx = abs(oldx - mousex) + 1; | |
| 4743 | - int dy = abs(oldy - mousey) + 1; | |
| 4744 | - int ox = (oldx > mousex) ? mousex : oldx; | |
| 4745 | - int oy = (oldy > mousey) ? mousey : oldy; | |
| 4742 | + TERM_POSITION dx = abs(oldx - mousex) + 1; | |
| 4743 | + TERM_POSITION dy = abs(oldy - mousey) + 1; | |
| 4744 | + TERM_POSITION ox = (oldx > mousex) ? mousex : oldx; | |
| 4745 | + TERM_POSITION oy = (oldy > mousey) ? mousey : oldy; | |
| 4746 | 4746 | |
| 4747 | 4747 | mouse_down = FALSE; |
| 4748 | 4748 | paint_rect = FALSE; |
| @@ -4947,8 +4947,8 @@ LRESULT FAR PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, | ||
| 4947 | 4947 | |
| 4948 | 4948 | case SIZE_RESTORED: |
| 4949 | 4949 | { |
| 4950 | - uint cols = (LOWORD(lParam) - td->size_ow1) / td->tile_wid; | |
| 4951 | - uint rows = (HIWORD(lParam) - td->size_oh1) / td->tile_hgt; | |
| 4950 | + TERM_POSITION cols = (LOWORD(lParam) - td->size_ow1) / td->tile_wid; | |
| 4951 | + TERM_POSITION rows = (HIWORD(lParam) - td->size_oh1) / td->tile_hgt; | |
| 4952 | 4952 | |
| 4953 | 4953 | /* New size */ |
| 4954 | 4954 | if ((td->cols != cols) || (td->rows != rows)) |
| @@ -5125,8 +5125,8 @@ LRESULT FAR PASCAL AngbandListProc(HWND hWnd, UINT uMsg, | ||
| 5125 | 5125 | |
| 5126 | 5126 | case WM_SIZE: |
| 5127 | 5127 | { |
| 5128 | - uint cols; | |
| 5129 | - uint rows; | |
| 5128 | + TERM_POSITION cols; | |
| 5129 | + TERM_POSITION rows; | |
| 5130 | 5130 | |
| 5131 | 5131 | /* this message was sent before WM_NCCREATE */ |
| 5132 | 5132 | if (!td) return 1; |
| @@ -318,7 +318,7 @@ bool gain_magic(void) | ||
| 318 | 318 | |
| 319 | 319 | if (o_ptr->tval == TV_ROD) |
| 320 | 320 | { |
| 321 | - p_ptr->magic_num2[o_ptr->sval + ext] += o_ptr->number; | |
| 321 | + p_ptr->magic_num2[o_ptr->sval + ext] += (MAGIC_NUM2)o_ptr->number; | |
| 322 | 322 | if (p_ptr->magic_num2[o_ptr->sval + ext] > 99) p_ptr->magic_num2[o_ptr->sval + ext] = 99; |
| 323 | 323 | } |
| 324 | 324 | else |
| @@ -334,7 +334,7 @@ bool gain_magic(void) | ||
| 334 | 334 | gain_num = (gain_num/3 + randint0(gain_num/3)) / 256; |
| 335 | 335 | if (gain_num < 1) gain_num = 1; |
| 336 | 336 | } |
| 337 | - p_ptr->magic_num2[o_ptr->sval + ext] += gain_num; | |
| 337 | + p_ptr->magic_num2[o_ptr->sval + ext] += (MAGIC_NUM2)gain_num; | |
| 338 | 338 | if (p_ptr->magic_num2[o_ptr->sval + ext] > 99) p_ptr->magic_num2[o_ptr->sval + ext] = 99; |
| 339 | 339 | p_ptr->magic_num1[o_ptr->sval + ext] += pval * 0x10000; |
| 340 | 340 | if (p_ptr->magic_num1[o_ptr->sval + ext] > 99 * 0x10000) p_ptr->magic_num1[o_ptr->sval + ext] = 99 * 0x10000; |
| @@ -3026,7 +3026,7 @@ bool recharge(int power) | ||
| 3026 | 3026 | */ |
| 3027 | 3027 | if ((o_ptr->tval == TV_STAFF) && (o_ptr->number > 1)) |
| 3028 | 3028 | { |
| 3029 | - recharge_amount /= o_ptr->number; | |
| 3029 | + recharge_amount /= (TIME_EFFECT)o_ptr->number; | |
| 3030 | 3030 | if (recharge_amount < 1) recharge_amount = 1; |
| 3031 | 3031 | } |
| 3032 | 3032 |
| @@ -1115,7 +1115,7 @@ struct player_type | ||
| 1115 | 1115 | SUB_EXP skill_exp[GINOU_MAX]; /* Proficiency of misc. skill */ |
| 1116 | 1116 | |
| 1117 | 1117 | MAGIC_NUM1 magic_num1[108]; /*!< Array for non-spellbook type magic */ |
| 1118 | - MAGIC_NUM2 magic_num2[108]; /*!< Flags for non-spellbook type magics */ | |
| 1118 | + MAGIC_NUM2 magic_num2[108]; /*!< 魔道具術師の取り込み済魔道具使用回数 / Flags for non-spellbook type magics */ | |
| 1119 | 1119 | |
| 1120 | 1120 | SPELL_IDX mane_spell[MAX_MANE]; |
| 1121 | 1121 | HIT_POINT mane_dam[MAX_MANE]; |
| @@ -4405,7 +4405,7 @@ void request_command(int shopping) | ||
| 4405 | 4405 | int i; |
| 4406 | 4406 | |
| 4407 | 4407 | char cmd; |
| 4408 | - BIT_FLAGS mode; | |
| 4408 | + int mode; | |
| 4409 | 4409 | |
| 4410 | 4410 | cptr act; |
| 4411 | 4411 |
Fork