mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-05-11 11:44:08 +00:00
fixes to some warnings in g++ c++20
This commit is contained in:
parent
546161ce28
commit
283928bf5e
@ -330,7 +330,7 @@ void drawLightning(const shiftmatrix& V) {
|
|||||||
|
|
||||||
void drawCurse(const shiftmatrix& V, eItem it) {
|
void drawCurse(const shiftmatrix& V, eItem it) {
|
||||||
#if CAP_QUEUE
|
#if CAP_QUEUE
|
||||||
float ds = ptick(450) + (it * 5.5); // Extra offset so both Gluttony and Repulsion are easily visible
|
float ds = ptick(450) + (int(it) * 5.5); // Extra offset so both Gluttony and Repulsion are easily visible
|
||||||
color_t col = darkena(iinf[it].color, 0, 0xFF);
|
color_t col = darkena(iinf[it].color, 0, 0xFF);
|
||||||
for(int u=0; u<20; u++) {
|
for(int u=0; u<20; u++) {
|
||||||
ld leng, rad;
|
ld leng, rad;
|
||||||
|
4
hud.cpp
4
hud.cpp
@ -73,7 +73,7 @@ bool ikappear(int i) {
|
|||||||
return ikmerge(i);
|
return ikmerge(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
const int glyphs = ittypes + motypes;
|
const int glyphs = int(ittypes) + int(motypes);
|
||||||
|
|
||||||
int gfirsttime[glyphs], glasttime[glyphs], gcopy[glyphs], ikland[glyphs];
|
int gfirsttime[glyphs], glasttime[glyphs], gcopy[glyphs], ikland[glyphs];
|
||||||
int glyphorder[glyphs];
|
int glyphorder[glyphs];
|
||||||
@ -302,7 +302,7 @@ bool displayglyph(int cx, int cy, int buttonsize, char glyph, color_t color, int
|
|||||||
qty < 100 ? buttonsize / 2 :
|
qty < 100 ? buttonsize / 2 :
|
||||||
buttonsize / 3;
|
buttonsize / 3;
|
||||||
|
|
||||||
if(id == moMutant + ittypes && clearing::imputed.nonzero()) {
|
if(id == int(moMutant) + int(ittypes) && clearing::imputed.nonzero()) {
|
||||||
bignum bn = clearing::imputed + qty;
|
bignum bn = clearing::imputed + qty;
|
||||||
str = short_form(bn);
|
str = short_form(bn);
|
||||||
bsize = buttonsize / 4;
|
bsize = buttonsize / 4;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user