Mercurial > mm7

diff mm7_data.cpp @ 279:3395164886cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 17 Feb 2013 19:48:54 +0600
parents f809f0465769 bcd55744c2f4
children e3b70ba42154
line wrap: on
line diff
--- a/mm7_data.cpp	Sun Feb 17 19:48:39 2013 +0600
+++ b/mm7_data.cpp	Sun Feb 17 19:48:54 2013 +0600
@@ -2,6 +2,7 @@
 
 #include "NPC.h"
 #include "Actor.h"
+#include "GUIWindow.h"
 
 
 
@@ -477,7 +478,7 @@
 char aS100110D[777]; // idb
 char aS100110DS[777]; // idb
 char aS100110D02dSS[777]; // idb
-int pCurrentScreen; // weak
+int pCurrentScreen = SCREEN_VIDEO; // 004E28F8
 char byte_4E28FC; // weak
 unsigned int uGammaPos;
 int dword_4E2910[777]; // weak