Mercurial > mm7

diff Game.cpp @ 1397:eb02a65e5c82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Quick Spell fixed. Removed CShow, ThreadWard structures.
author Nomad
date Fri, 19 Jul 2013 09:42:03 +0200
parents 8ea496564034
children 4fff79f04dbd
line wrap: on
line diff
--- a/Game.cpp	Thu Jul 18 17:29:20 2013 +0200
+++ b/Game.cpp	Fri Jul 19 09:42:03 2013 +0200
@@ -941,7 +941,8 @@
   uSomeGammaStartTime = 0;
   uSomeGammaDeltaTime = 0;
 
-  pThreadWardInstance = new ThreadWard;
+  //pThreadWardInstance = new ThreadWard;
+  pThreadWardInstance = nullptr;
   pParticleEngine = new ParticleEngine;
   pMouse = pMouseInstance = new Mouse(pThreadWardInstance);
   pLightmapBuilder = new LightmapBuilder;
@@ -954,7 +955,8 @@
   pStru11Instance = nullptr;
   //pStru12Instance = new stru12(pStru11Instance);
   pStru12Instance = nullptr;
-  pCShow = new CShow;
+  //pCShow = new CShow;
+  pCShow = nullptr;
   pKeyboardInstance = new Keyboard;
   pGammaController = new GammaController;
 
@@ -976,12 +978,12 @@
     delete pGammaController;
   if (pKeyboardInstance)
     delete pKeyboardInstance;
-  if (pCShow)
+  /*if (pCShow)
     delete pCShow;
   if (pStru12Instance)
     delete pStru12Instance;
   if (pStru11Instance)
-    delete pStru11Instance;
+    delete pStru11Instance;*/
   if (pStru10Instance)
     delete pStru10Instance;
   if (pStru9Instance)
@@ -998,8 +1000,8 @@
     delete pMouseInstance;
   if (pParticleEngine)
     delete pParticleEngine;
-  if (pThreadWardInstance)
-    delete pThreadWardInstance;
+  //if (pThreadWardInstance)
+  //  delete pThreadWardInstance;
 }
 
 //----- (0044E904) --------------------------------------------------------