matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some errors in visual studio

Browse Source
This commit is contained in:
jacob1 2012-09-14 19:12:28 -04:00 committed by Simon Robertshaw
parent ad0149a1bb
commit dd82ed8cd9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/Engine.h
View File

@ -60,7 +60,7 @@ namespace ui
inline int GetMaxWidth() { return maxWidth; } inline int GetMaxWidth() { return maxWidth; }
inline int GetMaxHeight() { return maxHeight; } 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); inline void SetSize(int width, int height);

3
src/virtualmachine/VirtualMachine.cpp
View File

@ -35,7 +35,7 @@ namespace vm
delete[] hunk; delete[] hunk;
} }
#define DEBUGTRACE(args...) printf(args); #define DEBUGTRACE(args, ...) printf(args);
int VirtualMachine::opcodeParameterSize(int opcode) int VirtualMachine::opcodeParameterSize(int opcode)
{ {
@ -316,6 +316,7 @@ namespace vm
ramMask = ramSize; ramMask = ramSize;
return 1;*/ return 1;*/
return 0; //temporary, something has to be returned for now
} }
void VirtualMachine::End() void VirtualMachine::End()