HAM5.5b2 merged in!

Notes:
-There may still be bugs!! (In fact, I almost guarantee it -- there's
-Ammo box code added to HR's crate code
-Splitting a crate/box also automatically refills half empty magazines
-new pathing arrows for map screen not included
-code for scouts to know where enemies are going doesn't appear to work... but i'm not sure it was completed.
-lots of gobledy gook (chinese?) comments turned back to english
-also added Bob's popups
-other languages besides english still need to have there language.cpp files updated with array changes
-AI enhancements by Warmsteel (reloading, suppression, roaming, avoiding gas, and other fixes)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5181 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Utils/popup_definition.h

@@ -0,0 +1,109 @@
+#ifndef POPUP_DEFINITION
+	#define POPUP_DEFINITION
+
+#include "sgp.h"	
+#include "popup_class.h"
+#include "popup_callback.h"
+
+namespace popupGenerators{
+
+	enum{
+	dummy = 1,
+	addArmor,
+	addLBE,
+	addWeapons,
+	addWeaponGroups,
+	addGrenades,
+	addBombs,
+	addFaceGear,
+	addAmmo,
+	addRifleGrenades,
+	addRocketAmmo,
+	addMisc,
+	addKits
+	};
+
+};
+
+class popupDef;
+class popupDefContent;
+
+class popupDefOption;
+class popupDefSubPopupOption;
+class popupDefContentGenerator;
+
+class popupDef{
+public:
+	popupDef();
+	~popupDef();
+
+	BOOL applyToBox(POPUP* popup);
+
+	BOOL addOption(std::wstring* name, UINT16 callbackId, UINT16 availId);
+
+	popupDef * addSubPopup(std::wstring* name);
+	BOOL addSubPopup(popupDefSubPopupOption* sub);
+
+	BOOL addGenerator(UINT16 id);
+protected:
+	std::vector<popupDefContent*> content;
+};
+
+class popupDefContent{
+public:
+	popupDefContent();
+	~popupDefContent();
+	
+	virtual BOOL addToBox(POPUP * popup) = 0;
+
+};
+
+class popupDefOption : public popupDefContent{
+public:
+	popupDefOption() : name( new std::wstring(L"Unnamed Option") ), callbackId(0), availId(0){};
+	popupDefOption( std::wstring* name, UINT16 callbackId, UINT16 availId ) : name( name ), callbackId(callbackId), availId(availId){};
+
+	~popupDefOption(){ delete this->name; };
+
+	BOOL addToBox(POPUP * popup);
+
+protected:
+	std::wstring* name;
+	UINT16 callbackId;
+	UINT16 availId;
+
+};
+
+class popupDefSubPopupOption : public popupDefContent{
+public:
+	popupDefSubPopupOption() : name( new std::wstring(L"Unnamed Submenu") ){ this->content = new popupDef(); };
+	popupDefSubPopupOption( std::wstring* name ) : name( name ){ this->content = new popupDef(); };
+
+	~popupDefSubPopupOption(){ delete this->name; delete this->content; };
+
+	BOOL addToBox(POPUP * popup);
+	void rename( std::wstring* name ){
+		delete this->name;	// lets just hope nothing else was using this string. TODO: use smart pointer
+		this->name = name;
+	};
+	popupDef * getSubDef(){ return this->content; };
+
+protected:
+	std::wstring* name;
+	popupDef * content;
+};
+
+class popupDefContentGenerator: public popupDefContent{
+public:
+	popupDefContentGenerator() : generatorId(0){};
+	popupDefContentGenerator( UINT16 generatorId ) : generatorId( generatorId ){};
+
+	~popupDefContentGenerator();
+
+	BOOL addToBox(POPUP * popup);
+
+protected:	
+	UINT16 generatorId;
+};
+
+#endif