From dd82ed8cd9cb10f620647401d19ae78052cece45 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Fri, 14 Sep 2012 19:12:28 -0400 Subject: [PATCH] fix some errors in visual studio --- src/interface/Engine.h | 2 +- src/virtualmachine/VirtualMachine.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/interface/Engine.h b/src/interface/Engine.h index 960069c79..c40f3a42c 100644 --- a/src/interface/Engine.h +++ b/src/interface/Engine.h @@ -60,7 +60,7 @@ namespace ui inline int GetMaxWidth() { return maxWidth; } inline int GetMaxHeight() { return maxHeight; } - inline void SetMaxSize(int width, int height); + TPT_NO_INLINE void SetMaxSize(int width, int height); inline void SetSize(int width, int height); diff --git a/src/virtualmachine/VirtualMachine.cpp b/src/virtualmachine/VirtualMachine.cpp index fe871f3ba..929723a22 100644 --- a/src/virtualmachine/VirtualMachine.cpp +++ b/src/virtualmachine/VirtualMachine.cpp @@ -35,7 +35,7 @@ namespace vm delete[] hunk; } - #define DEBUGTRACE(args...) printf(args); + #define DEBUGTRACE(args, ...) printf(args); int VirtualMachine::opcodeParameterSize(int opcode) { @@ -316,6 +316,7 @@ namespace vm ramMask = ramSize; return 1;*/ + return 0; //temporary, something has to be returned for now } void VirtualMachine::End()