mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Correct spelling of color

pull/556/head^2^2
Anders Jenbo 6 years ago
parent
bae579ab90
commit
cee06d07a7
6 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/diablo.cpp
  2. 4
      Source/gamemenu.cpp
  3. 76
      Source/inv.cpp
  4. 2
      Source/palette.cpp
  5. 2
      Source/palette.h
  6. 2
      comparer-config/diablo.toml

2
Source/diablo.cpp
Unescape View File

@ -1893,7 +1893,7 @@ void diablo_color_cyc_logic()
tc = GetTickCount(); tc = GetTickCount();
if (tc - color_cycle_timer >= 50) { if (tc - color_cycle_timer >= 50) {
color_cycle_timer = tc; color_cycle_timer = tc;
if (palette_get_colour_cycling()) { if (palette_get_color_cycling()) {
if (leveltype == DTYPE_HELL) { if (leveltype == DTYPE_HELL) {
lighting_color_cycling(); lighting_color_cycling();
} else if (leveltype == DTYPE_CAVES) { } else if (leveltype == DTYPE_CAVES) {

4
Source/gamemenu.cpp
Unescape View File

@ -195,7 +195,7 @@ void gamemenu_get_sound()
void gamemenu_get_color_cycling() 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() void gamemenu_get_gamma()
@ -305,6 +305,6 @@ void gamemenu_color_cycling(BOOL bActivate)
{ {
BOOL color_cycling; 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]; sgOptionsMenu[3].pszStr = color_cycling_toggle_names[color_cycling & 1];
} }

76
Source/inv.cpp
Unescape View File

@ -170,7 +170,7 @@ void InvDrawSlotBack(int X, int Y, int W, int H)
void DrawInv() void DrawInv()
{ {
BOOL invtest[NUM_INV_GRID_ELEM]; 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; BYTE *pBuff;
CelDraw(RIGHT_PANEL_X, 351 + SCREEN_Y, pInvCels, 1, 320); CelDraw(RIGHT_PANEL_X, 351 + SCREEN_Y, pInvCels, 1, 320);
@ -182,14 +182,14 @@ void DrawInv()
frame_width = InvItemWidth[frame]; frame_width = InvItemWidth[frame];
if (pcursinvitem == INVITEM_HEAD) { if (pcursinvitem == INVITEM_HEAD) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvBody[INVLOC_HEAD]._iMagical != ITEM_QUALITY_NORMAL) { if (plr[myplr].InvBody[INVLOC_HEAD]._iMagical != ITEM_QUALITY_NORMAL) {
colour = ICOL_BLUE; color = ICOL_BLUE;
} }
if (!plr[myplr].InvBody[INVLOC_HEAD]._iStatFlag) { 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) { if (plr[myplr].InvBody[INVLOC_HEAD]._iStatFlag) {
@ -206,14 +206,14 @@ void DrawInv()
frame_width = InvItemWidth[frame]; frame_width = InvItemWidth[frame];
if (pcursinvitem == INVITEM_RING_LEFT) { if (pcursinvitem == INVITEM_RING_LEFT) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvBody[INVLOC_RING_LEFT]._iMagical != ITEM_QUALITY_NORMAL) { 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) { 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) { if (plr[myplr].InvBody[INVLOC_RING_LEFT]._iStatFlag) {
@ -230,14 +230,14 @@ void DrawInv()
frame_width = InvItemWidth[frame]; frame_width = InvItemWidth[frame];
if (pcursinvitem == INVITEM_RING_RIGHT) { if (pcursinvitem == INVITEM_RING_RIGHT) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvBody[INVLOC_RING_RIGHT]._iMagical != ITEM_QUALITY_NORMAL) { 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) { 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) { if (plr[myplr].InvBody[INVLOC_RING_RIGHT]._iStatFlag) {
@ -254,14 +254,14 @@ void DrawInv()
frame_width = InvItemWidth[frame]; frame_width = InvItemWidth[frame];
if (pcursinvitem == INVITEM_AMULET) { if (pcursinvitem == INVITEM_AMULET) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvBody[INVLOC_AMULET]._iMagical != ITEM_QUALITY_NORMAL) { if (plr[myplr].InvBody[INVLOC_AMULET]._iMagical != ITEM_QUALITY_NORMAL) {
colour = ICOL_BLUE; color = ICOL_BLUE;
} }
if (!plr[myplr].InvBody[INVLOC_AMULET]._iStatFlag) { 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) { 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); screen_y = InvItemHeight[frame] == (3 * INV_SLOT_SIZE_PX) ? (160 + SCREEN_Y) : (146 + SCREEN_Y);
if (pcursinvitem == INVITEM_HAND_LEFT) { if (pcursinvitem == INVITEM_HAND_LEFT) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvBody[INVLOC_HAND_LEFT]._iMagical != ITEM_QUALITY_NORMAL) { 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) { 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) { 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); screen_y = InvItemHeight[frame] == 3 * INV_SLOT_SIZE_PX ? (160 + SCREEN_Y) : (146 + SCREEN_Y);
if (pcursinvitem == INVITEM_HAND_RIGHT) { if (pcursinvitem == INVITEM_HAND_RIGHT) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iMagical != ITEM_QUALITY_NORMAL) { 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) { 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) { if (plr[myplr].InvBody[INVLOC_HAND_RIGHT]._iStatFlag) {
@ -344,14 +344,14 @@ void DrawInv()
frame_width = InvItemWidth[frame]; frame_width = InvItemWidth[frame];
if (pcursinvitem == INVITEM_CHEST) { if (pcursinvitem == INVITEM_CHEST) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvBody[INVLOC_CHEST]._iMagical != ITEM_QUALITY_NORMAL) { if (plr[myplr].InvBody[INVLOC_CHEST]._iMagical != ITEM_QUALITY_NORMAL) {
colour = ICOL_BLUE; color = ICOL_BLUE;
} }
if (!plr[myplr].InvBody[INVLOC_CHEST]._iStatFlag) { 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) { if (plr[myplr].InvBody[INVLOC_CHEST]._iStatFlag) {
@ -382,15 +382,15 @@ void DrawInv()
frame = plr[myplr].InvList[ii]._iCurs + CURSOR_FIRSTITEM; frame = plr[myplr].InvList[ii]._iCurs + CURSOR_FIRSTITEM;
frame_width = InvItemWidth[frame]; frame_width = InvItemWidth[frame];
if (pcursinvitem == ii + INVITEM_INV_FIRST) { if (pcursinvitem == ii + INVITEM_INV_FIRST) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].InvList[ii]._iMagical != ITEM_QUALITY_NORMAL) { if (plr[myplr].InvList[ii]._iMagical != ITEM_QUALITY_NORMAL) {
colour = ICOL_BLUE; color = ICOL_BLUE;
} }
if (!plr[myplr].InvList[ii]._iStatFlag) { if (!plr[myplr].InvList[ii]._iStatFlag) {
colour = ICOL_RED; color = ICOL_RED;
} }
CelBlitOutline( CelBlitOutline(
colour, color,
InvRect[j + SLOTXY_INV_FIRST].X + SCREEN_X, InvRect[j + SLOTXY_INV_FIRST].X + SCREEN_X,
InvRect[j + SLOTXY_INV_FIRST].Y + SCREEN_Y - 1, InvRect[j + SLOTXY_INV_FIRST].Y + SCREEN_Y - 1,
pCursCels, frame, frame_width, 0, 8); pCursCels, frame, frame_width, 0, 8);
@ -413,7 +413,7 @@ void DrawInv()
void DrawInvBelt() void DrawInvBelt()
{ {
int i, frame, frame_width, colour; int i, frame, frame_width, color;
BYTE fi, ff; BYTE fi, ff;
if (talkflag) { if (talkflag) {
@ -432,12 +432,12 @@ void DrawInvBelt()
frame_width = InvItemWidth[frame]; frame_width = InvItemWidth[frame];
if (pcursinvitem == i + INVITEM_BELT_FIRST) { if (pcursinvitem == i + INVITEM_BELT_FIRST) {
colour = ICOL_WHITE; color = ICOL_WHITE;
if (plr[myplr].SpdList[i]._iMagical) if (plr[myplr].SpdList[i]._iMagical)
colour = ICOL_BLUE; color = ICOL_BLUE;
if (!plr[myplr].SpdList[i]._iStatFlag) if (!plr[myplr].SpdList[i]._iStatFlag)
colour = ICOL_RED; color = 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); 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) { if (plr[myplr].SpdList[i]._iStatFlag) {

2
Source/palette.cpp
Unescape View File

@ -284,7 +284,7 @@ void palette_update_quest_palette(int n)
} }
#endif #endif
BOOL palette_get_colour_cycling() BOOL palette_get_color_cycling()
{ {
return color_cycling_enabled; return color_cycling_enabled;
} }

2
Source/palette.h
Unescape View File

@ -20,7 +20,7 @@ void PaletteFadeIn(int fr);
void PaletteFadeOut(int fr); void PaletteFadeOut(int fr);
void palette_update_caves(); void palette_update_caves();
void palette_update_quest_palette(int n); void palette_update_quest_palette(int n);
BOOL palette_get_colour_cycling(); BOOL palette_get_color_cycling();
BOOL palette_set_color_cycling(BOOL enabled); BOOL palette_set_color_cycling(BOOL enabled);
/* rdata */ /* rdata */

2
comparer-config/diablo.toml
Unescape View File

@ -6943,7 +6943,7 @@ addr = 0x449398
size = 0x2E size = 0x2E
[[func]] [[func]]
name = "palette_get_colour_cycling" name = "palette_get_color_cycling"
addr = 0x4493C6 addr = 0x4493C6
size = 0x6 size = 0x6

Write Preview
Loading…
Cancel
Save