Permalink
Browse files

fix level 1 msvc compiling warnings + initialize debugFlags

  • Loading branch information...
jacob1 committed Oct 8, 2014
1 parent a78bd78 commit c16caed5dde69eaaddeb9e86490ae7147dce3c3e
@@ -1644,7 +1644,7 @@ void GameSave::readPSv(char * data, int dataLength)
}
if (ver < 88) //fix air blowing stickmen
if ((particles[i-1].type == PT_STKM || particles[i-1].type == PT_STKM2 || particles[i-1].type == PT_FIGH) && particles[i-1].ctype == OLD_SPC_AIR)
particles[i-1].ctype == SPC_AIR;
particles[i-1].ctype = SPC_AIR;
if (ver < 89)
{
if (particles[i-1].type == PT_FILT)
@@ -130,7 +130,8 @@ GameController::GameController():
localBrowser(NULL),
foundSign(NULL),
HasDone(false),
firstTick(true)
firstTick(true),
debugFlags(0)
{
gameView = new GameView();
gameModel = new GameModel();
@@ -833,7 +833,7 @@ bool GameModel::GetPaused()
void GameModel::SetDecoration(bool decorationState)
{
if (ren->decorations_enable != decorationState)
if (ren->decorations_enable != (decorationState?1:0))
{
ren->decorations_enable = decorationState?1:0;
notifyDecorationChanged();
@@ -436,6 +436,7 @@ int LuaScriptInterface::tpt_newIndex(lua_State *l)
//if not a special key, set a value in the table
return lua_rawset(l, 1), 1;
}
return 0;
}
//// Begin Interface API
@@ -41,7 +41,9 @@ static inline int resampler_range_check(int v, int h) { (void)h; resampler_asser
#define RESAMPLER_DEBUG 0
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
// Float to int cast with truncation.
static inline int cast_to_int(Resample_Real i)

0 comments on commit c16caed

Please sign in to comment.