diff --git a/Source/diablo.cpp b/Source/diablo.cpp index 4279b2d27..cb6a73a8c 100644 --- a/Source/diablo.cpp +++ b/Source/diablo.cpp @@ -1893,7 +1893,7 @@ void diablo_color_cyc_logic() tc = GetTickCount(); if (tc - color_cycle_timer >= 50) { color_cycle_timer = tc; - if (palette_get_colour_cycling()) { + if (palette_get_color_cycling()) { if (leveltype == DTYPE_HELL) { lighting_color_cycling(); } else if (leveltype == DTYPE_CAVES) { diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp index 63926f846..0445a70a4 100644 --- a/Source/gamemenu.cpp +++ b/Source/gamemenu.cpp @@ -195,7 +195,7 @@ void gamemenu_get_sound() void gamemenu_get_color_cycling() { - sgOptionsMenu[3].pszStr = color_cycling_toggle_names[palette_get_colour_cycling() & 1]; + sgOptionsMenu[3].pszStr = color_cycling_toggle_names[palette_get_color_cycling() & 1]; } void gamemenu_get_gamma() @@ -305,6 +305,6 @@ void gamemenu_color_cycling(BOOL bActivate) { BOOL color_cycling; - color_cycling = palette_set_color_cycling(palette_get_colour_cycling() == 0); + color_cycling = palette_set_color_cycling(palette_get_color_cycling() == 0); sgOptionsMenu[3].pszStr = color_cycling_toggle_names[color_cycling & 1]; } diff --git a/Source/inv.cpp b/Source/inv.cpp index 41b2e2bd5..c10c8e5f0 100644 --- a/Source/inv.cpp +++ b/Source/inv.cpp @@ -170,7 +170,7 @@ void InvDrawSlotBack(int X, int Y, int W, int H) void DrawInv() { BOOL invtest[NUM_INV_GRID_ELEM]; - int frame, frame_width, colour, screen_x, screen_y, i, j, ii; + int frame, frame_width, color, screen_x, screen_y, i, j, ii; BYTE *pBuff; CelDraw(RIGHT_PANEL_X, 351 + SCREEN_Y, pInvCels, 1, 320); @@ -182,14 +182,14 @@ void DrawInv() frame_width = InvItemWidth[frame]; if (pcursinvitem == INVITEM_HEAD) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvBody[INVLOC_HEAD]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvBody[INVLOC_HEAD]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } - CelBlitOutline(colour, RIGHT_PANEL_X + 133, 59 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); + CelBlitOutline(color, RIGHT_PANEL_X + 133, 59 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].InvBody[INVLOC_HEAD]._iStatFlag) { @@ -206,14 +206,14 @@ void DrawInv() frame_width = InvItemWidth[frame]; if (pcursinvitem == INVITEM_RING_LEFT) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvBody[INVLOC_RING_LEFT]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvBody[INVLOC_RING_LEFT]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } - CelBlitOutline(colour, RIGHT_PANEL_X + 48, 205 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); + CelBlitOutline(color, RIGHT_PANEL_X + 48, 205 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].InvBody[INVLOC_RING_LEFT]._iStatFlag) { @@ -230,14 +230,14 @@ void DrawInv() frame_width = InvItemWidth[frame]; if (pcursinvitem == INVITEM_RING_RIGHT) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvBody[INVLOC_RING_RIGHT]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvBody[INVLOC_RING_RIGHT]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } - CelBlitOutline(colour, RIGHT_PANEL_X + 249, 205 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); + CelBlitOutline(color, RIGHT_PANEL_X + 249, 205 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].InvBody[INVLOC_RING_RIGHT]._iStatFlag) { @@ -254,14 +254,14 @@ void DrawInv() frame_width = InvItemWidth[frame]; if (pcursinvitem == INVITEM_AMULET) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvBody[INVLOC_AMULET]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvBody[INVLOC_AMULET]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } - CelBlitOutline(colour, RIGHT_PANEL_X + 205, 60 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); + CelBlitOutline(color, RIGHT_PANEL_X + 205, 60 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].InvBody[INVLOC_AMULET]._iStatFlag) { @@ -281,14 +281,14 @@ void DrawInv() screen_y = InvItemHeight[frame] == (3 * INV_SLOT_SIZE_PX) ? (160 + SCREEN_Y) : (146 + SCREEN_Y); if (pcursinvitem == INVITEM_HAND_LEFT) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvBody[INVLOC_HAND_LEFT]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } - CelBlitOutline(colour, screen_x, screen_y, pCursCels, frame, frame_width, 0, 8); + CelBlitOutline(color, screen_x, screen_y, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iStatFlag) { @@ -320,14 +320,14 @@ void DrawInv() screen_y = InvItemHeight[frame] == 3 * INV_SLOT_SIZE_PX ? (160 + SCREEN_Y) : (146 + SCREEN_Y); if (pcursinvitem == INVITEM_HAND_RIGHT) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } - CelBlitOutline(colour, screen_x, screen_y, pCursCels, frame, frame_width, 0, 8); + CelBlitOutline(color, screen_x, screen_y, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) { @@ -344,14 +344,14 @@ void DrawInv() frame_width = InvItemWidth[frame]; if (pcursinvitem == INVITEM_CHEST) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvBody[INVLOC_CHEST]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvBody[INVLOC_CHEST]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } - CelBlitOutline(colour, RIGHT_PANEL_X + 133, 160 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); + CelBlitOutline(color, RIGHT_PANEL_X + 133, 160 + SCREEN_Y, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].InvBody[INVLOC_CHEST]._iStatFlag) { @@ -382,15 +382,15 @@ void DrawInv() frame = plr[myplr].InvList[ii]._iCurs + CURSOR_FIRSTITEM; frame_width = InvItemWidth[frame]; if (pcursinvitem == ii + INVITEM_INV_FIRST) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].InvList[ii]._iMagical != ITEM_QUALITY_NORMAL) { - colour = ICOL_BLUE; + color = ICOL_BLUE; } if (!plr[myplr].InvList[ii]._iStatFlag) { - colour = ICOL_RED; + color = ICOL_RED; } CelBlitOutline( - colour, + color, InvRect[j + SLOTXY_INV_FIRST].X + SCREEN_X, InvRect[j + SLOTXY_INV_FIRST].Y + SCREEN_Y - 1, pCursCels, frame, frame_width, 0, 8); @@ -413,7 +413,7 @@ void DrawInv() void DrawInvBelt() { - int i, frame, frame_width, colour; + int i, frame, frame_width, color; BYTE fi, ff; if (talkflag) { @@ -432,12 +432,12 @@ void DrawInvBelt() frame_width = InvItemWidth[frame]; if (pcursinvitem == i + INVITEM_BELT_FIRST) { - colour = ICOL_WHITE; + color = ICOL_WHITE; if (plr[myplr].SpdList[i]._iMagical) - colour = ICOL_BLUE; + color = ICOL_BLUE; if (!plr[myplr].SpdList[i]._iStatFlag) - colour = ICOL_RED; - CelBlitOutline(colour, InvRect[i + SLOTXY_BELT_FIRST].X + SCREEN_X, InvRect[i + SLOTXY_BELT_FIRST].Y + SCREEN_Y - 1, pCursCels, frame, frame_width, 0, 8); + color = ICOL_RED; + CelBlitOutline(color, InvRect[i + SLOTXY_BELT_FIRST].X + SCREEN_X, InvRect[i + SLOTXY_BELT_FIRST].Y + SCREEN_Y - 1, pCursCels, frame, frame_width, 0, 8); } if (plr[myplr].SpdList[i]._iStatFlag) { diff --git a/Source/palette.cpp b/Source/palette.cpp index ca37da1c4..93cadc93a 100644 --- a/Source/palette.cpp +++ b/Source/palette.cpp @@ -284,7 +284,7 @@ void palette_update_quest_palette(int n) } #endif -BOOL palette_get_colour_cycling() +BOOL palette_get_color_cycling() { return color_cycling_enabled; } diff --git a/Source/palette.h b/Source/palette.h index 58099287e..223cf8ae3 100644 --- a/Source/palette.h +++ b/Source/palette.h @@ -20,7 +20,7 @@ void PaletteFadeIn(int fr); void PaletteFadeOut(int fr); void palette_update_caves(); void palette_update_quest_palette(int n); -BOOL palette_get_colour_cycling(); +BOOL palette_get_color_cycling(); BOOL palette_set_color_cycling(BOOL enabled); /* rdata */ diff --git a/comparer-config/diablo.toml b/comparer-config/diablo.toml index 12dfa5f2d..bff95c252 100644 --- a/comparer-config/diablo.toml +++ b/comparer-config/diablo.toml @@ -6943,7 +6943,7 @@ addr = 0x449398 size = 0x2E [[func]] -name = "palette_get_colour_cycling" +name = "palette_get_color_cycling" addr = 0x4493C6 size = 0x6