Mercurial > mm7

diff Player.cpp @ 1020:3413ad40cc88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Tue, 21 May 2013 07:24:49 +0400
parents 32ec62bbaa2c 9ac94d00012e
children 67e33708d815
line wrap: on
line diff
--- a/Player.cpp	Tue May 21 01:21:10 2013 +0400
+++ b/Player.cpp	Tue May 21 07:24:49 2013 +0400
@@ -1,14 +1,15 @@
 #include <assert.h>
 
+#include "stru6.h"
+
+
 #include "OSAPI.h"
 #include "Player.h"
 #include "PlayerFrameTable.h"
-#include "Texture.h"
 #include "AudioPlayer.h"
 #include "Party.h"
 #include "Log.h"
 #include "LOD.h"
-#include "Monsters.h" 
 #include "GUIWindow.h"
 #include "Viewport.h"
 #include "Actor.h"