Move _numActors to a more sensible place, and make it protected; fix confirmFOODialog() method names to comply with our guidelines

svn-id: r17658

1 files changed, 4 insertions, 6 deletions

diff --git a/scumm/scumm.h b/scumm/scumm.h
index 6ad002e63c..80ee075b0d 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -384,7 +384,6 @@ public:
 	byte _gameId;
 	byte _version;
 	byte _heversion;
-	byte _numActors;
 	uint32 _features;						// Should only be accessed for reading (TODO enforce it compiler-wise with making it private and creating an accessor)
 	uint8 _gameMD5[16];
 
@@ -465,19 +464,18 @@ protected:
 	Dialog *_versionDialog;
 	Dialog *_mainMenuDialog;
 
-protected:
 	int runDialog(Dialog &dialog);
-	void confirmexitDialog();
-	void confirmrestartDialog();
+	void confirmExitDialog();
+	void confirmRestartDialog();
 	void pauseDialog();
 	void versionDialog();
 	void mainMenuDialog();
-protected:
+
 	char displayMessage(const char *altButton, const char *message, ...);
 
-protected:
 	byte _fastMode;
 
+	byte _numActors;
 	Actor *_actors;	// Has _numActors elements
 	
 	byte *_arraySlot;