Mercurial > mm7
changeset 137:a2ddaf0e4d8a
automerge fix
author | Nomad |
---|---|
date | Mon, 11 Feb 2013 20:27:00 +0200 |
parents | 541f3df0aa55 |
children | a8ec7e1e18b6 76bc8ee82948 |
files | Game.cpp |
diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/Game.cpp Mon Feb 11 20:26:16 2013 +0200 +++ b/Game.cpp Mon Feb 11 20:27:00 2013 +0200 @@ -1,3 +1,5 @@ +#include <assert.h> + #include "Game.h" #include "Party.h" #include "IndoorCamera.h" @@ -104,6 +106,7 @@ pIndoor->Draw(); else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor) pOutdoor->Draw(); + else assert(false); if (pRenderer->pRenderD3D) {