diff Events.cpp @ 2153:d28d3c006077

Some Render decoupling.
author Nomad
date Thu, 09 Jan 2014 02:34:20 +0200
parents ad71de147333
children e9625ad08541
line wrap: on
line diff
--- a/Events.cpp	Thu Jan 09 01:37:34 2014 +0200
+++ b/Events.cpp	Thu Jan 09 02:34:20 2014 +0200
@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
 #include <stdlib.h>
 
 #include "Weather.h"
@@ -1362,8 +1358,7 @@
         v134 = v96 + ((_evt->v26 + ((_evt->v27 + ((uint)_evt->v28 << 8)) << 8)) << 8);
         if ( _evt->v29 || _evt->v30 )
           {
-          if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode )
-            pRenderer->_49FD3A();
+            pRenderer->Sub01();
           TransitionUI_Load(_evt->v29, _evt->v30, v135, v132, v126, v129, v95, v134, (char *)&_evt->v31);
           dword_5C3418 = uEventID;
           dword_5C341C = curr_seq_num + 1;
@@ -1480,8 +1475,7 @@
       case EVENT_SpeakInHouse:
         if ( EnterHouse((enum HOUSE_ID)EVT_DWORD(_evt->v5)))
           {
-          if ( pRenderer->pRenderD3D && !pRenderer->bWindowMode )
-            pRenderer->_49FD3A();
+            pRenderer->Sub01();
           pAudioPlayer->PlaySound((SoundID)0, 0, 0, -1, 0, 0, 0, 0);
           pAudioPlayer->PlaySound(SOUND_EnteringAHouse, 814, 0, -1, 0, 0, 0, 0);
           v104 = 187;