back from merge

This commit is contained in:
Pawel Kolodziejski 2005-08-13 11:55:22 +00:00
parent be282dd536
commit f6093896c8

View file

@ -287,6 +287,7 @@ void Engine::mainLoop() {
int frame = g_smush->getFrame();
if (frame > 0) {
if (frame != prevSmushFrame) {
prevSmushFrame = g_smush->getFrame();
g_driver->drawSmushFrame(g_smush->getX(), g_smush->getY());
if (SHOWFPS_GLOBAL)
g_driver->drawEmergString(550, 25, fps, Color(255, 255, 255));