Browse Source

Fix compiler warnings.

mingodad 7 years ago
parent
commit
baf276e6ce
2 changed files with 2 additions and 1 deletions
  1. 1 1
      SquiLu/squirrel/sqobject.cpp
  2. 1 0
      SquiLu/squirrel/sqvm.cpp

+ 1 - 1
SquiLu/squirrel/sqobject.cpp

@@ -790,7 +790,7 @@ bool SQFunctionProto::SaveAsSource(SQVM *v,SQUserPointer up,SQWRITEFUNC write)
             case _OP_AND:
             case _OP_OR:
                         SafeWriteFmt(v,write,up,"\t\t/* %s(stk_at_arg2[%d]) {stk_at_arg0[%d] = stk[%d]; goto[%d]} */",
-                                     _OP_OR ? "IsTrue" : "IsFalse",
+                                     ((inst.op == _OP_OR) ? "IsTrue" : "IsFalse"),
                                      inst._arg2, inst._arg0, inst._arg2, i + inst._arg1 + 1);
             break;
             case _OP_JZ:

+ 1 - 0
SquiLu/squirrel/sqvm.cpp

@@ -1336,6 +1336,7 @@ exception_trap:
 		return false;
 	}
 	assert(0);
+	return false;
 }
 
 bool SQVM::CreateClassInstance(SQClass *theclass, SQObjectPtr &inst, SQObjectPtr &constructor)