diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-14 23:12:28 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-16 11:09:13 (GMT) |
| commit | dd82ed8cd9cb10f620647401d19ae78052cece45 (patch) | |
| tree | 4d5c564485aa6f6e1ae3e9fbedbdfcc53dce7719 /src | |
| parent | ad0149a1bb1bb88de71a58871cba2b14b7db8df5 (diff) | |
| download | powder-dd82ed8cd9cb10f620647401d19ae78052cece45.zip powder-dd82ed8cd9cb10f620647401d19ae78052cece45.tar.gz | |
fix some errors in visual studio
Diffstat (limited to 'src')
| -rw-r--r-- | src/interface/Engine.h | 2 | ||||
| -rw-r--r-- | 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 960069c..c40f3a4 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 fe871f3..929723a 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() |