Remove duplicated code in actor walk code.

Turn ActionMap into real object.
Rename ActionMap variables to conform our code guidelines.

svn-id: r15456

1 files changed, 6 insertions, 0 deletions

diff --git a/saga/scene.h b/saga/scene.h
index e787722c2d..6a7a0ce480 100644
--- a/saga/scene.h
+++ b/saga/scene.h
@@ -27,6 +27,7 @@
 #define SAGA_SCENE_H
 
 #include "saga/text.h"
+#include "saga/actionmap.h"
 
 namespace Saga {
 
@@ -235,6 +236,8 @@ class Scene {
 	void sceneInfoCmd(int argc, char *argv[]);
 	void sceneChangeCmd(int argc, char *argv[]);
 
+	void drawActionMap(R_SURFACE *ds, int color) { _actionMap->draw(ds, color); }
+
  private:
 	int loadScene(int scene, int load_flag, R_SCENE_PROC scene_proc, R_SCENE_DESC *, 
 				  int fadeIn);
@@ -271,6 +274,9 @@ class Scene {
 	static int SC_defaultScene(int param, R_SCENE_INFO *scene_info, void *refCon);
 	int defaultScene(int param, R_SCENE_INFO *scene_info);
 
+ public:
+	ActionMap *_actionMap;
+
  private:
 	int IHNMStartProc();
 	int ITEStartProc();