From 1de4b2bdbb019be6f1b7262c3eba5568d7682edd Mon Sep 17 00:00:00 2001
From: "milo24x7@gmail.com"
 <milo24x7@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>
Date: Sun, 7 Jul 2013 21:51:48 +0000
Subject: Updated open source license declaration and fixed some formatting
 issues.

---
 Magic2/ContentBundle.h | 120 +++++++++++++++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 48 deletions(-)

(limited to 'Magic2/ContentBundle.h')

diff --git a/Magic2/ContentBundle.h b/Magic2/ContentBundle.h
index 4848716..d75a817 100644
--- a/Magic2/ContentBundle.h
+++ b/Magic2/ContentBundle.h
@@ -1,48 +1,72 @@
-/*  Project nGenEx
-	Destroyer Studios LLC
-	Copyright © 1997-2006. All Rights Reserved.
-
-	SUBSYSTEM:    nGenEx.lib
-	FILE:         ContentBundle.h
-	AUTHOR:       John DiCamillo
-
-
-	OVERVIEW
-	========
-	Chained collection of localized strings
-*/
-
-#ifndef ContentBundle_h
-#define ContentBundle_h
-
-#include "Types.h"
-#include "Dictionary.h"
-#include "Text.h"
-#include "Locale_ss.h"
-
-// +--------------------------------------------------------------------+
-
-class ContentBundle
-{
-public:
-	static const char* TYPENAME() { return "ContentBundle"; }
-
-	ContentBundle(const char* bundle, Locale* locale);
-	virtual ~ContentBundle();
-
-	int operator == (const ContentBundle& that)  const { return this == &that; }
-
-	const Text&       GetName()                  const { return name; }
-	Text              GetText(const char* key)   const;
-	bool              IsLoaded()                 const { return !values.isEmpty(); }
-
-protected:
-	void LoadBundle(const char* filename);
-	Text FindFile(const char* bundle, Locale* locale);
-
-	Text              name;
-	Dictionary<Text>  values;
-};
-
-#endif ContentBundle_h
-
+/*  Starshatter OpenSource Distribution
+    Copyright (c) 1997-2004, Destroyer Studios LLC.
+    All Rights Reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name "Destroyer Studios" nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+
+    SUBSYSTEM:    nGenEx.lib
+    FILE:         ContentBundle.h
+    AUTHOR:       John DiCamillo
+
+
+    OVERVIEW
+    ========
+    Chained collection of localized strings
+*/
+
+#ifndef ContentBundle_h
+#define ContentBundle_h
+
+#include "Types.h"
+#include "Dictionary.h"
+#include "Text.h"
+#include "Locale_ss.h"
+
+// +--------------------------------------------------------------------+
+
+class ContentBundle
+{
+public:
+    static const char* TYPENAME() { return "ContentBundle"; }
+
+    ContentBundle(const char* bundle, Locale* locale);
+    virtual ~ContentBundle();
+
+    int operator == (const ContentBundle& that)  const { return this == &that; }
+
+    const Text&       GetName()                  const { return name; }
+    Text              GetText(const char* key)   const;
+    bool              IsLoaded()                 const { return !values.isEmpty(); }
+
+protected:
+    void LoadBundle(const char* filename);
+    Text FindFile(const char* bundle, Locale* locale);
+
+    Text              name;
+    Dictionary<Text>  values;
+};
+
+#endif ContentBundle_h
+
-- 
cgit v1.1