mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-24 17:10:36 +00:00
Fix some truncation warnings for the benefit of MSVC.
rug.cpp(1266): warning C4305: 'argument': truncation from 'double' to 'GLclampf' tour.cpp(629): warning C4305: '=': truncation from 'int' to 'bool'
This commit is contained in:
parent
f10f5a29b2
commit
de8926ac5d
@ -1601,7 +1601,7 @@ namespace mapeditor {
|
||||
mapeditor::paintwhat_str = "clear monster";
|
||||
mapeditor::copysource.c = NULL;
|
||||
mapeditor::undo.clear();
|
||||
if(!cheater) patterns::displaycodes = 0;
|
||||
if(!cheater) patterns::displaycodes = false;
|
||||
if(!cheater) patterns::whichShape = 0;
|
||||
modelcell.clear();
|
||||
}) +
|
||||
|
2
rug.cpp
2
rug.cpp
@ -1263,7 +1263,7 @@ void drawRugScene() {
|
||||
glBindTexture( GL_TEXTURE_2D, alternate_texture);
|
||||
|
||||
if(backcolor == 0)
|
||||
glClearColor(0.05,0.05,0.05,1);
|
||||
glClearColor(0.05f,0.05f,0.05f,1.0f);
|
||||
else
|
||||
glhr::colorClear(backcolor << 8 | 0xFF);
|
||||
#ifdef GLES_ONLY
|
||||
|
4
tour.cpp
4
tour.cpp
@ -626,10 +626,10 @@ slide default_slides[] = {
|
||||
[] (presmode mode) {
|
||||
setCanvas(mode, 't');
|
||||
if(mode == 1)
|
||||
patterns::displaycodes = 2,
|
||||
patterns::displaycodes = true,
|
||||
patterns::whichPattern = 'z';
|
||||
if(mode == 3)
|
||||
patterns::displaycodes = 0,
|
||||
patterns::displaycodes = false,
|
||||
patterns::whichPattern = 0;
|
||||
SHOWLAND ( l == laCanvas );
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user