# HG changeset patch # User Nomad # Date 1360607220 -7200 # Node ID a2ddaf0e4d8ac430fe8e067199c0b63fe84d2899 # Parent 541f3df0aa557f083dea93b5524dc784323999b9 automerge fix diff -r 541f3df0aa55 -r a2ddaf0e4d8a Game.cpp --- 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 + #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) {