diff --git a/SConstruct b/SConstruct
index 5b56a49..f457c13 100644
--- a/SConstruct
+++ b/SConstruct
@@ -19,7 +19,7 @@ def message(program,msg):
def get_Werror_string(l):
if l and '-Werror' in l:
return '-W'
- return '-Werror='
+ return '-W' #'-Werror='
class StaticSubprocess:
# This class contains utility functions for calling subprocesses
@@ -345,7 +345,7 @@ class ConfigureTests:
custom_tests = _custom_test.tests
comment_not_supported = '/* not supported */'
__python_import_struct = None
- __flags_Werror = {'CXXFLAGS' : ['-Werror']}
+ #__flags_Werror = {'CXXFLAGS' : ['-Werror']}
_cxx_conformance_cxx11 = 11
_cxx_conformance_cxx14 = 14
__cxx_conformance = None
@@ -767,12 +767,13 @@ help:assume C++ compiler works
if self.user_settings.record_sconf_results:
self._sconf_results.append((calling_function, 'skipped'))
return
- env_flags = self.PreservedEnvironment(context.env, successflags.keys() + testflags.keys() + self.__flags_Werror.keys() + ['CPPDEFINES'])
+ env_flags = self.PreservedEnvironment(context.env, successflags.keys() + testflags.keys() + ['CPPDEFINES'])
+ #+ self.__flags_Werror.keys() + ['CPPDEFINES'])
context.env.MergeFlags(successflags)
forced, expected = self._check_sconf_forced(calling_function)
- caller_modified_env_flags = self.PreservedEnvironment(context.env, self.__flags_Werror.keys() + testflags.keys())
+ caller_modified_env_flags = self.PreservedEnvironment(context.env, testflags.keys()) #self.__flags_Werror.keys() + testflags.keys())
# Always pass -Werror
- context.env.Append(**self.__flags_Werror)
+ #context.env.Append(**self.__flags_Werror)
context.env.Append(**testflags)
# If forced is None, run the test. Otherwise, skip the test and
# take an action determined by the value of forced.
diff --git a/common/include/maths.h b/common/include/maths.h
index a7521ac..4f6e960 100644
--- a/common/include/maths.h
+++ b/common/include/maths.h
@@ -62,7 +62,7 @@ static constexpr int f2i(const fix &f)
//Convert fix to float and float to fix
static constexpr float f2fl(const fix &f)
{
- return static_cast<float>(f) / static_cast<float>(65536.0);
+ return static_cast<float>(f) / 65536.0f;//static_cast<float>(65536.0);
}
static constexpr double f2db(const fix &f)
diff --git a/common/include/partial_range.h b/common/include/partial_range.h
old mode 100644
new mode 100755
diff --git a/similar/arch/ogl/gr.cpp b/similar/arch/ogl/gr.cpp
index 8070bfb..2fae373 100644
--- a/similar/arch/ogl/gr.cpp
+++ b/similar/arch/ogl/gr.cpp
@@ -637,8 +637,8 @@ int gr_set_mode(screen_mode mode)
unsigned char *gr_bm_data;
if (!gr_check_mode(mode))
{
- con_printf(CON_URGENT, "Cannot set %ix%i. Fallback to 640x480", mode.width, mode.height);
- mode.width = 640;
+ con_printf(CON_URGENT, "Cannot set %ix%i. Fallback to 800x480", mode.width, mode.height);
+ mode.width = 800;
mode.height = 480;
Game_screen_mode = mode;
}
diff --git a/similar/arch/sdl/gr.cpp b/similar/arch/sdl/gr.cpp
index d966cf9..976b82f 100644
--- a/similar/arch/sdl/gr.cpp
+++ b/similar/arch/sdl/gr.cpp
@@ -105,8 +105,8 @@ int gr_set_mode(screen_mode mode)
}
else
{
- con_printf(CON_URGENT,"Cannot set %hux%hu. Fallback to 640x480", SM_W(mode), SM_H(mode));
- mode.width = 640;
+ con_printf(CON_URGENT,"Cannot set %hux%hu. Fallback to 800x480", SM_W(mode), SM_H(mode));
+ mode.width = 800; //640; //PANDORA
mode.height = 480;
Game_screen_mode = mode;
}
diff --git a/similar/main/config.cpp b/similar/main/config.cpp
index 8ff99c6..c99db9b 100644
--- a/similar/main/config.cpp
+++ b/similar/main/config.cpp
@@ -123,10 +123,10 @@ int ReadConfigFile()
GameCfg.GammaLevel = 0;
GameCfg.LastPlayer = {};
CGameCfg.LastMission = "";
- GameCfg.ResolutionX = 640;
+ GameCfg.ResolutionX = 800;//640; //SEB Pandora
GameCfg.ResolutionY = 480;
- GameCfg.AspectX = 3;
- GameCfg.AspectY = 4;
+ GameCfg.AspectX = 10;//3;
+ GameCfg.AspectY = 16; //4;
CGameCfg.WindowMode = false;
CGameCfg.TexFilt = 0;
CGameCfg.TexAnisotropy = 0;
diff --git a/similar/main/game.cpp b/similar/main/game.cpp
index 4a948f9..02976f4 100644
--- a/similar/main/game.cpp
+++ b/similar/main/game.cpp
@@ -169,7 +169,7 @@ void reset_palette_add()
PaletteBlueAdd = 0;
}
-screen_mode Game_screen_mode{640, 480};
+screen_mode Game_screen_mode{800/*640*/, 480}; //SEB Pandora
}
@@ -193,7 +193,7 @@ void init_cockpit()
#if defined(DXX_BUILD_DESCENT_II)
int HiresGFXAvailable = !GameArg.GfxSkipHiresGFX;
#endif
- auto full_screen_mode = HiresGFXAvailable ? screen_mode{640, 480} : screen_mode{320, 200};
+ auto full_screen_mode = HiresGFXAvailable ? screen_mode{800/*640*/, 480} : screen_mode{320, 200}; //SEB Pandora
if (Game_screen_mode != full_screen_mode) {
PlayerCfg.CockpitMode[1] = CM_FULL_SCREEN;
}
diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp
old mode 100644
new mode 100755
index 0fc2965..09d2771
--- a/similar/main/multi.cpp
+++ b/similar/main/multi.cpp
@@ -1866,7 +1866,7 @@ static void multi_do_player_deres(const playernum_t pnum, const ubyte *buf)
map_objnum_local_to_remote(static_cast<short>(i), s, pnum);
count += 2;
}
- range_for (const auto i, partial_const_range(Net_create_objnums, remote_created, Net_create_loc))
+ range_for (const auto i, partial_const_range(Net_create_objnums, static_cast<unsigned>(remote_created), Net_create_loc))
{
vobjptr(i)->flags |= OF_SHOULD_BE_DEAD;
}
diff --git a/similar/main/newdemo.cpp b/similar/main/newdemo.cpp
old mode 100644
new mode 100755
index 3aa2c98..01aa746
--- a/similar/main/newdemo.cpp
+++ b/similar/main/newdemo.cpp
@@ -994,7 +994,7 @@ static void nd_rdt(char (&buf)[7])
static void nd_rbe()
{
- char buf[7]{ND_EVENT_PALETTE_EFFECT, 0x80};
+ char buf[7]{ND_EVENT_PALETTE_EFFECT, (char)0x80};
newdemo_write(buf, 1, sizeof(buf));
++buf[2];
nd_rdt(buf);
diff --git a/similar/main/render.cpp b/similar/main/render.cpp
old mode 100644
new mode 100755
index f1e9cc4..2d4067f
--- a/similar/main/render.cpp
+++ b/similar/main/render.cpp
@@ -317,7 +317,7 @@ static void render_face(const segment &segp, const unsigned sidenum, const unsig
{
dli.g = dli.b = fixmul(flash_scale, uvli.l);
dli.r = (!seismic_tremor_magnitude && PlayerCfg.DynLightColor)
- ? fixmul(std::max(static_cast<double>(flash_scale), f0_5 * 1.5), uvli.l) // let the mine glow red a little
+ ? fixmul(std::max(static_cast<float>(flash_scale), f0_5 * 1.5), uvli.l) // let the mine glow red a little
: dli.g;
}