Introduced new namespace, Sword1, removing the "Sword" and "Bs" prefixes in

the process, except for SwordEngine.

Some minor cleanups along the wa, e.g. stdafx.h already includes <stdio.h>,
<stdlib.h> and <math.h> so there shouldn't be any need to do it elsewhere.

svn-id: r12320

1 files changed, 6 insertions, 2 deletions

diff --git a/sword1/objectman.h b/sword1/objectman.h
index 7207e99d3a..3df047d379 100644
--- a/sword1/objectman.h
+++ b/sword1/objectman.h
@@ -28,13 +28,15 @@
 #include "sworddefs.h"
 #include "object.h"
 
+namespace Sword1 {
+
 class ObjectMan {
 public:
 	ObjectMan(ResMan *pResourceMan);
 	~ObjectMan(void);
 	void initialize(void);
 
-	BsObject *fetchObject(uint32 id);
+	Object *fetchObject(uint32 id);
 	uint32 fetchNoObjects(int section);
 	bool sectionAlive(uint16 section);
 	void megaEntering(uint16 section);
@@ -45,7 +47,7 @@ public:
 	void unlockText(uint32 textId);
 	uint32 lastTextNumber(int section);
 
-    void closeSection(uint32 screen);
+	void closeSection(uint32 screen);
 	
 	void saveLiveList(uint16 *dest); // for loading/saving
 	void loadLiveList(uint16 *src);
@@ -57,5 +59,7 @@ private:
 	uint8 *_cptData[TOTAL_SECTIONS];
 };
 
+} // End of namespace Sword1 
+
 #endif //OBJECTMAN_H