projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Ifdef parts of Kernel::Execute back in, so we have a game loop again :-)
[matthijs/ABM2.git]
/
ABM2
/
Engine
/
Kernel.cpp
diff --git
a/ABM2/Engine/Kernel.cpp
b/ABM2/Engine/Kernel.cpp
index 12afa65230fd612f541dab224d80d41d0ce834bb..7638ab10c0c725094ccf9c7638b182f0f53904c1 100755
(executable)
--- a/
ABM2/Engine/Kernel.cpp
+++ b/
ABM2/Engine/Kernel.cpp
@@
-27,6
+27,7
@@
int CKernel::Execute()
{
\r
#ifdef WIN32
\r
MSG msg;
\r
{
\r
#ifdef WIN32
\r
MSG msg;
\r
+#endif // WIN32
\r
\r
while(taskList.size())
\r
{
\r
\r
while(taskList.size())
\r
{
\r
@@
-35,11
+36,13
@@
int CKernel::Execute()
\r
//DWORD starting_point = GetTickCount();
\r
\r
\r
//DWORD starting_point = GetTickCount();
\r
\r
+#ifdef WIN32
\r
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
\r
{
\r
TranslateMessage(&msg);
\r
DispatchMessage(&msg);
\r
}
\r
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
\r
{
\r
TranslateMessage(&msg);
\r
DispatchMessage(&msg);
\r
}
\r
+#endif // WIN32
\r
\r
\r
std::list< CMMPointer<ITask> >::iterator it, thisIt;
\r
\r
\r
std::list< CMMPointer<ITask> >::iterator it, thisIt;
\r
@@
-70,7
+73,6
@@
int CKernel::Execute()
CProfileSample::Output();
\r
#endif
\r
}
\r
CProfileSample::Output();
\r
#endif
\r
}
\r
-#endif // WIN32
\r
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r