Mercurial > mm7

changeset 123:4e35bb416dea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
11.02.13
author Ritor1
date Mon, 11 Feb 2013 19:13:23 +0600
parents acff5a5d563b
children eeb0a8222d59
files Game.cpp Vis.cpp Vis.h
diffstat 3 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Game.cpp	Sun Feb 10 23:06:36 2013 +0600
+++ b/Game.cpp	Mon Feb 11 19:13:23 2013 +0600
@@ -1074,7 +1074,7 @@
 {
   if ( !pCurrentScreen && pVisInstance && pRenderer->pRenderD3D )
   {
-    bool r = pVisInstance->_4C05CC(&pVisInstance->stru1, a3, a4);
+    bool r = pVisInstance->PickKeyboard(&pVisInstance->stru1, a3, a4);
 
     if (bOutline)
       OutlineSelection();
@@ -1082,6 +1082,18 @@
   }
   return false;
 }
+/*
+Result::Code Game::PickKeyboard(bool bOutline, struct unnamed_F93E6C *a3, struct unnamed_F93E6C *a4)
+{
+ if (dword_4E28F8_PartyCantJumpIfTrue)
+   return Result::Generic;
+
+ pVis->PickKeyboard(a3, a4);
+ if (bOutline)
+   Game_outline_selection((int)this);
+ return Result::Success;
+}
+*/
 // 4E28F8: using guessed type int pCurrentScreen;
 
 //----- (0044EB5A) --------------------------------------------------------
--- a/Vis.cpp	Sun Feb 10 23:06:36 2013 +0600
+++ b/Vis.cpp	Mon Feb 11 19:13:23 2013 +0600
@@ -1433,7 +1433,7 @@
   Vis *thisa; // [sp+68h] [bp-8h]@1
   RenderVertexSoft *v16; // [sp+6Ch] [bp-4h]@2
 
-  __debugbreak();
+  //__debugbreak();
 
   result = sRight;
   thisa = this;
@@ -1586,7 +1586,7 @@
 
 
 //----- (004C05CC) --------------------------------------------------------
-bool Vis::_4C05CC(Vis_stru1 *a2, stru157 *a3, stru157 *a4)
+bool Vis::PickKeyboard(Vis_stru1 *a2, stru157 *a3, stru157 *a4)
 {
   Vis_stru1 *v4; // esi@1
   Vis *v5; // ebx@1
--- a/Vis.h	Sun Feb 10 23:06:36 2013 +0600
+++ b/Vis.h	Mon Feb 11 19:13:23 2013 +0600
@@ -42,7 +42,7 @@
   //virtual ~Vis() {}
   //----- (004C05BE) --------------------------------------------------------
   ~Vis() {}
-  bool _4C05CC(Vis_stru1 *a2, struct stru157 *a3, struct stru157 *a4);
+  bool PickKeyboard(Vis_stru1 *a2, struct stru157 *a3, struct stru157 *a4);
   bool PickMouse(float fDepth, float fMouseX, float fMouseY, struct stru157 *a5, struct stru157 *a6);
   void _4C06F8(float arg0, Vis_stru1 *a3, struct stru157 *a2);
   bool is_part_of_selection(struct BLVFace *uD3DBillboardIdx_or_pBLVFace_or_pODMFace, struct stru157 *a2);