Mercurial > mm7
comparison mm7_2.cpp @ 2423:1b6bf88f561b
fixing some memory access errors
author | Grumpy7 |
---|---|
date | Tue, 22 Jul 2014 23:07:24 +0200 |
parents | 0313c761d203 |
children | d922225a6081 94393b73d333 |
comparison
equal
deleted
inserted
replaced
2422:bb1273b1b9b6 | 2423:1b6bf88f561b |
---|---|
1420 } | 1420 } |
1421 | 1421 |
1422 | 1422 |
1423 srand(GetTickCount()); | 1423 srand(GetTickCount()); |
1424 | 1424 |
1425 pEventTimer = Timer::Create(); | |
1426 pEventTimer->Initialize(); | |
1425 window = OSWindow::Create(L"Might and MagicŪ Trilogy", game_width, game_height); | 1427 window = OSWindow::Create(L"Might and MagicŪ Trilogy", game_width, game_height); |
1426 | 1428 |
1427 pRenderer = Render::Create(); | 1429 pRenderer = Render::Create(); |
1428 if (!pRenderer) | 1430 if (!pRenderer) |
1429 { | 1431 { |
1457 | 1459 |
1458 MM6_Initialize(pMM6IniFile); | 1460 MM6_Initialize(pMM6IniFile); |
1459 | 1461 |
1460 pKeyActionMap = new KeyboardActionMapping; | 1462 pKeyActionMap = new KeyboardActionMapping; |
1461 | 1463 |
1462 pEventTimer = Timer::Create(); | |
1463 pEventTimer->Initialize(); | |
1464 // _CrtDumpMemoryLeaks(); | 1464 // _CrtDumpMemoryLeaks(); |
1465 OnTimer(1); | 1465 OnTimer(1); |
1466 GameUI_StatusBar_UpdateTimedString(1); | 1466 GameUI_StatusBar_UpdateTimedString(1); |
1467 pGame = Game::Create(); | 1467 pGame = Game::Create(); |
1468 pMouse = pGame->pMouseInstance; | 1468 pMouse = pGame->pMouseInstance; |