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

---
 Stars45/CombatAssignment.h | 138 ++++++++++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 57 deletions(-)

(limited to 'Stars45/CombatAssignment.h')

diff --git a/Stars45/CombatAssignment.h b/Stars45/CombatAssignment.h
index 2d4d0a6..549a483 100644
--- a/Stars45/CombatAssignment.h
+++ b/Stars45/CombatAssignment.h
@@ -1,57 +1,81 @@
-/*  Project Starshatter 4.5
-	Destroyer Studios LLC
-	Copyright © 1997-2004. All Rights Reserved.
-
-	SUBSYSTEM:    Stars.exe
-	FILE:         CombatAssignment.h
-	AUTHOR:       John DiCamillo
-
-
-	OVERVIEW
-	========
-	High level assignment of one group to damage another
-*/
-
-#ifndef CombatAssignment_h
-#define CombatAssignment_h
-
-#include "Types.h"
-#include "List.h"
-
-// +--------------------------------------------------------------------+
-
-class CombatGroup;
-class SimRegion;
-
-// +--------------------------------------------------------------------+
-
-class CombatAssignment
-{
-public:
-	static const char* TYPENAME() { return "CombatAssignment"; }
-
-	CombatAssignment(int t, CombatGroup* obj, CombatGroup* rsc=0);
-	~CombatAssignment();
-
-	int operator < (const CombatAssignment& a) const;
-
-	// operations:
-	void                 SetObjective(CombatGroup* o)  { objective = o; }
-	void                 SetResource(CombatGroup* r)   { resource  = r; }
-
-	// accessors:
-	int                  Type()            { return type;      }
-	CombatGroup*         GetObjective()    { return objective; }
-	CombatGroup*         GetResource()     { return resource;  }
-
-	const char*          GetDescription()  const;
-	bool                 IsActive()  const { return resource != 0; }
-
-private:        
-	int                  type;
-	CombatGroup*         objective;
-	CombatGroup*         resource;
-};
-
-
-#endif CombatAssignment_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:    Stars.exe
+    FILE:         CombatAssignment.h
+    AUTHOR:       John DiCamillo
+
+
+    OVERVIEW
+    ========
+    High level assignment of one group to damage another
+*/
+
+#ifndef CombatAssignment_h
+#define CombatAssignment_h
+
+#include "Types.h"
+#include "List.h"
+
+// +--------------------------------------------------------------------+
+
+class CombatGroup;
+class SimRegion;
+
+// +--------------------------------------------------------------------+
+
+class CombatAssignment
+{
+public:
+    static const char* TYPENAME() { return "CombatAssignment"; }
+
+    CombatAssignment(int t, CombatGroup* obj, CombatGroup* rsc=0);
+    ~CombatAssignment();
+
+    int operator < (const CombatAssignment& a) const;
+
+    // operations:
+    void                 SetObjective(CombatGroup* o)  { objective = o; }
+    void                 SetResource(CombatGroup* r)   { resource  = r; }
+
+    // accessors:
+    int                  Type()            { return type;      }
+    CombatGroup*         GetObjective()    { return objective; }
+    CombatGroup*         GetResource()     { return resource;  }
+
+    const char*          GetDescription()  const;
+    bool                 IsActive()  const { return resource != 0; }
+
+private:        
+    int                  type;
+    CombatGroup*         objective;
+    CombatGroup*         resource;
+};
+
+
+#endif CombatAssignment_h
-- 
cgit v1.1