Merge remote-tracking branch 'origin/master' into HEAD

ZDoom · Feb 6, 2019 · 20a9587 · 20a9587
2 parents d96d0b4 + 78c0b7f
commit 20a9587
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -133,7 +133,7 @@ script:
       -DPK3_QUIET_ZIPDIR=YES     \
       ..
   - if [[ $TRAVIS_OS_NAME == 'windows' ]]; then cmake --build . -- -m; fi
-  - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2; fi
+  - if [[ $TRAVIS_OS_NAME != 'windows' ]]; then cmake --build . -- -j2 -k; fi
 
 notifications:
   email: false
diff --git a/src/scripting/backend/codegen.h b/src/scripting/backend/codegen.h
@@ -2106,7 +2106,7 @@ class FxNop : public FxExpression
 		: FxExpression(EFX_Nop, p)
 	{
 		isresolved = true;
-		ValueType = TypeError;
+		ValueType = TypeVoid;
 	}
 	ExpEmit Emit(VMFunctionBuilder *build)
 	{